diff options
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/ci/commit_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/merge_request_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb index 22f8639e5ab..2c6e6db682f 100644 --- a/spec/models/ci/commit_spec.rb +++ b/spec/models/ci/commit_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Ci::Commit, models: true do +describe Ci::Pipeline, models: true do let(:project) { FactoryGirl.create :empty_project } let(:commit) { FactoryGirl.create :ci_commit, project: project } diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 118e1e22a78..23d09331e5a 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -402,7 +402,7 @@ describe MergeRequest, models: true do with('123abc', 'master'). and_return(ci_commit) - expect(subject.ci_commit).to eq(ci_commit) + expect(subject.pipeline).to eq(ci_commit) end end @@ -410,7 +410,7 @@ describe MergeRequest, models: true do it 'returns nil' do allow(subject).to receive(:source_project).and_return(nil) - expect(subject.ci_commit).to be_nil + expect(subject.pipeline).to be_nil end end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 338a4c3d3f0..44debdbdc1c 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -403,7 +403,7 @@ describe Project, models: true do let(:project) { create :project } let(:commit) { create :ci_commit, project: project, ref: 'master' } - subject { project.ci_commit(commit.sha, 'master') } + subject { project.pipeline(commit.sha, 'master') } it { is_expected.to eq(commit) } |