Merge branch 'enable-auto-cancelling-by-default' into 'master'

Make auto-cancelling pending pipelines on by default

Closes #30656

See merge request !11023

1 files changed, 5 insertions, 2 deletions

diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 3289c2df1fb..f4bc63bcc6a 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -4,13 +4,16 @@ describe PostReceive do
   let(:changes) { "123456 789012 refs/heads/tést\n654321 210987 refs/tags/tag" }
   let(:wrongly_encoded_changes) { changes.encode("ISO-8859-1").force_encoding("UTF-8") }
   let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) }
-  let(:project) { create(:project, :repository) }
   let(:project_identifier) { "project-#{project.id}" }
   let(:key) { create(:key, user: project.owner) }
   let(:key_id) { key.shell_id }
 
+  let(:project) do
+    create(:project, :repository, auto_cancel_pending_pipelines: 'disabled')
+  end
+
   context "as a sidekiq worker" do
-    it "reponds to #perform" do
+    it "responds to #perform" do
       expect(described_class.new).to respond_to(:perform)
     end
   end