diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-08 12:09:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-08 12:09:24 +0000 |
commit | b0d4724e47f94c9b1b2676382084ef964200e3c1 (patch) | |
tree | ce6fc40991e049c022b01a37cbecea12c3285405 /spec/models/ci | |
parent | 058e1a233fc1d96917c72cfab552c72db93f4f8b (diff) | |
download | gitlab-ce-b0d4724e47f94c9b1b2676382084ef964200e3c1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/ci')
-rw-r--r-- | spec/models/ci/pipeline_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 14591d1d632..7357ba5267b 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -1479,7 +1479,7 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do let(:build_c) { create_build('build3', queued_at: 0) } %w[succeed! drop! cancel! skip! block! delay!].each do |action| - context "when the pipeline recieved #{action} event" do + context "when the pipeline received #{action} event" do it 'deletes a persistent ref' do expect(pipeline.persistent_ref).to receive(:delete).once @@ -1702,7 +1702,7 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do end %w[succeed! drop! cancel! skip!].each do |action| - context "when the pipeline recieved #{action} event" do + context "when the pipeline received #{action} event" do it 'performs AutoMergeProcessWorker' do expect(AutoMergeProcessWorker).to receive(:perform_async).with(merge_request.id) |