summaryrefslogtreecommitdiff
path: root/spec/models/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 12:07:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 12:07:48 +0000
commitef31adeb0fb9a02b2c6a4529ec4e38d7082a4b2b (patch)
treef0ee2b8bdffd7f91ad0b31388562c90825179585 /spec/models/ci
parent7e019504f5ac6decde690565857238e7e59aa034 (diff)
downloadgitlab-ce-ef31adeb0fb9a02b2c6a4529ec4e38d7082a4b2b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/ci')
-rw-r--r--spec/models/ci/pipeline_spec.rb24
1 files changed, 0 insertions, 24 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index c3f2e3aebdd..425194ba0e3 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -3061,20 +3061,6 @@ describe Ci::Pipeline, :mailer do
expect(pipeline.source_bridge).to eq bridge
end
end
-
- describe '#update_bridge_status!' do
- it 'can update bridge status if it is running' do
- pipeline.update_bridge_status!
-
- expect(bridge.reload).to be_success
- end
-
- it 'can not update bridge status if is not active' do
- bridge.success!
-
- expect { pipeline.update_bridge_status! }.not_to change { bridge.status }
- end
- end
end
context 'when an upstream status is a build' do
@@ -3101,16 +3087,6 @@ describe Ci::Pipeline, :mailer do
expect(pipeline.source_bridge).to be_nil
end
end
-
- describe '#update_bridge_status!' do
- it 'tracks an ArgumentError and does not update upstream job status' do
- expect(Gitlab::ErrorTracking)
- .to receive(:track_exception)
- .with(instance_of(ArgumentError), pipeline_id: pipeline.id)
-
- pipeline.update_bridge_status!
- end
- end
end
end
end