diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-08-16 00:43:06 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-08-16 00:43:06 +0800 |
| commit | d79fb3e3ca47f6d6cd7aa81811d884340a0b0a64 (patch) | |
| tree | ff9b8631900a1b4a61c392bd78818a53b3ec5178 | |
| parent | 567ef6c1755c13dfcda1c9cb06b1eb5fbca0ef1b (diff) | |
| download | gitlab-ce-d79fb3e3ca47f6d6cd7aa81811d884340a0b0a64.tar.gz | |
Fix tests which broke in the merge
| -rw-r--r-- | spec/requests/api/commits_spec.rb | 4 | ||||
| -rw-r--r-- | spec/services/ci/image_for_build_service_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb index 7ca75d77673..5b3dc60aba2 100644 --- a/spec/requests/api/commits_spec.rb +++ b/spec/requests/api/commits_spec.rb @@ -95,7 +95,7 @@ describe API::API, api: true do end it "returns status for CI" do - pipeline = project.ensure_pipeline(project.repository.commit.sha, 'master') + pipeline = project.ensure_pipeline('master', project.repository.commit.sha) pipeline.update(status: 'success') get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user) @@ -105,7 +105,7 @@ describe API::API, api: true do end it "returns status for CI when pipeline is created" do - project.ensure_pipeline(project.repository.commit.sha, 'master') + project.ensure_pipeline('master', project.repository.commit.sha) get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user) diff --git a/spec/services/ci/image_for_build_service_spec.rb b/spec/services/ci/image_for_build_service_spec.rb index c931c3e4829..b3e0a7b9b58 100644 --- a/spec/services/ci/image_for_build_service_spec.rb +++ b/spec/services/ci/image_for_build_service_spec.rb @@ -5,7 +5,7 @@ module Ci let(:service) { ImageForBuildService.new } let(:project) { FactoryGirl.create(:empty_project) } let(:commit_sha) { '01234567890123456789' } - let(:pipeline) { project.ensure_pipeline(commit_sha, 'master') } + let(:pipeline) { project.ensure_pipeline('master', commit_sha) } let(:build) { FactoryGirl.create(:ci_build, pipeline: pipeline) } describe '#execute' do |