diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-11 20:54:02 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-11 20:58:32 +0200 |
commit | d0aafe71ea9f01996c1ec1656ca7381a714325be (patch) | |
tree | e2d5a0ce710e5962229a155091afa3443e3d805e /spec/services | |
parent | d983c5bd4671d989edf3741d0db0a54dcef9c3b6 (diff) | |
download | gitlab-ce-fix-pipeline-processing.tar.gz |
Use state machine for pipeline event processingfix-pipeline-processing
Conflicts:
app/models/ci/pipeline.rb
spec/models/ci/pipeline_spec.rb
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/ci/image_for_build_service_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/services/ci/image_for_build_service_spec.rb b/spec/services/ci/image_for_build_service_spec.rb index 259062406c7..c931c3e4829 100644 --- a/spec/services/ci/image_for_build_service_spec.rb +++ b/spec/services/ci/image_for_build_service_spec.rb @@ -14,7 +14,6 @@ module Ci context 'branch name' do before { allow(project).to receive(:commit).and_return(OpenStruct.new(sha: commit_sha)) } before { build.run! } - before { pipeline.reload_status! } let(:image) { service.execute(project, ref: 'master') } it { expect(image).to be_kind_of(OpenStruct) } @@ -32,7 +31,6 @@ module Ci context 'commit sha' do before { build.run! } - before { pipeline.reload_status! } let(:image) { service.execute(project, sha: build.sha) } it { expect(image).to be_kind_of(OpenStruct) } |