Commit a74184eb authored by Shinya Maeda's avatar Shinya Maeda

Fix static analysys

parent 46fa3089
...@@ -15,7 +15,7 @@ module Ci ...@@ -15,7 +15,7 @@ module Ci
belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule' belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
has_internal_id :iid, scope: :project, presence: false, init: ->(s) do has_internal_id :iid, scope: :project, presence: false, init: ->(s) do
s&.project&.pipelines&.maximum(:iid) || s&.project&.pipelines.count s&.project&.pipelines&.maximum(:iid) || s&.project&.pipelines&.count
end end
has_many :stages has_many :stages
......
module IIDRoutes module IidRoutes
## ##
# This automagically enforces all related routes to use `iid` instead of `id` # This automagically enforces all related routes to use `iid` instead of `id`
# If you want to use `iid` for some routes and `id` for other routes, this module should not to be included, # If you want to use `iid` for some routes and `id` for other routes, this module should not to be included,
......
class Deployment < ActiveRecord::Base class Deployment < ActiveRecord::Base
include AtomicInternalId include AtomicInternalId
include IIDRoutes include IidRoutes
belongs_to :project, required: true belongs_to :project, required: true
belongs_to :environment, required: true belongs_to :environment, required: true
......
...@@ -2,7 +2,7 @@ require 'carrierwave/orm/activerecord' ...@@ -2,7 +2,7 @@ require 'carrierwave/orm/activerecord'
class Issue < ActiveRecord::Base class Issue < ActiveRecord::Base
include AtomicInternalId include AtomicInternalId
include IIDRoutes include IidRoutes
include Issuable include Issuable
include Noteable include Noteable
include Referable include Referable
......
class MergeRequest < ActiveRecord::Base class MergeRequest < ActiveRecord::Base
include AtomicInternalId include AtomicInternalId
include IIDRoutes include IidRoutes
include Issuable include Issuable
include Noteable include Noteable
include Referable include Referable
......
...@@ -9,7 +9,7 @@ class Milestone < ActiveRecord::Base ...@@ -9,7 +9,7 @@ class Milestone < ActiveRecord::Base
include CacheMarkdownField include CacheMarkdownField
include AtomicInternalId include AtomicInternalId
include IIDRoutes include IidRoutes
include Sortable include Sortable
include Referable include Referable
include StripAttribute include StripAttribute
......
...@@ -41,13 +41,13 @@ describe Gitlab::Ci::Pipeline::Chain::Create do ...@@ -41,13 +41,13 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
it 'breaks the chain' do it 'breaks the chain' do
expect(step.break?).to be true expect(step.break?).to be true
end end
it 'appends validation error' do it 'appends validation error' do
expect(pipeline.errors.to_a) expect(pipeline.errors.to_a)
.to include /Failed to persist the pipeline/ .to include /Failed to persist the pipeline/
end end
end end
context 'when ref is nil' do context 'when ref is nil' do
let(:pipeline) do let(:pipeline) do
build(:ci_pipeline, project: project, ref: nil) build(:ci_pipeline, project: project, ref: nil)
...@@ -64,7 +64,7 @@ describe Gitlab::Ci::Pipeline::Chain::Create do ...@@ -64,7 +64,7 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
before do before do
allow_any_instance_of(Ci::Pipeline).to receive(:ensure_project_iid!) { |p| p.send(:write_attribute, :iid, 1) } allow_any_instance_of(Ci::Pipeline).to receive(:ensure_project_iid!) { |p| p.send(:write_attribute, :iid, 1) }
create(:ci_pipeline, project: project) create(:ci_pipeline, project: project)
step.perform! step.perform!
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment