Button fix

4 files changed, 4 insertions, 4 deletions

diff --git a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
index 2e64e903d1e..b5f319f2040 100644
--- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
@@ -68,7 +68,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
       expect(page).to have_button  "Merge When Build Succeeds"
 
       visit_merge_request(merge_request) # Needed to refresh the page
-      expect(page).to have_content "Cancelled the automatic merge"
+      expect(page).to have_content "Canceled the automatic merge"
     end
 
     it "allows the user to remove the source branch" do
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 63e1cd1fb92..33acfa37fea 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -192,7 +192,7 @@ describe MergeRequest do
     end
   end
 
-  describe '#can_remove_source_branch' do
+  describe '#can_remove_source_branch?' do
     let(:user) { create(:user) }
     let(:user2) { create(:user) }
 
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
index a62d88cde86..188fda6211f 100644
--- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
@@ -78,7 +78,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
 
     it 'Posts a system note' do
       note = mr_merge_if_green_enabled.notes.last
-      expect(note.note).to include 'Cancelled the automatic merge'
+      expect(note.note).to include 'Canceled the automatic merge'
     end
   end
 end
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 333035f2d2c..15173cee0a2 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -229,7 +229,7 @@ describe SystemNoteService do
     it_behaves_like 'a system note'
 
     it "posts the Merge When Build Succeeds system note" do
-      expect(subject.note).to eq  "Cancelled the automatic merge"
+      expect(subject.note).to eq  "Canceled the automatic merge"
     end
   end