Add latest changes from gitlab-org/gitlab@master

2 files changed, 26 insertions, 8 deletions

diff --git a/spec/features/admin/integrations/user_activates_mattermost_slash_command_spec.rb b/spec/features/admin/integrations/user_activates_mattermost_slash_command_spec.rb
index 6f091d37995..c4626996d0c 100644
--- a/spec/features/admin/integrations/user_activates_mattermost_slash_command_spec.rb
+++ b/spec/features/admin/integrations/user_activates_mattermost_slash_command_spec.rb
@@ -11,6 +11,24 @@ RSpec.describe 'User activates the instance-level Mattermost Slash Command integ
   end
 
   let(:edit_path) { edit_admin_application_settings_integration_path(:mattermost_slash_commands) }
+  let(:overrides_path) { overrides_admin_application_settings_integration_path(:mattermost_slash_commands) }
 
   include_examples 'user activates the Mattermost Slash Command integration'
+
+  it 'displays navigation tabs' do
+    expect(page).to have_link('Settings', href: edit_path)
+    expect(page).to have_link('Projects using custom settings', href: overrides_path)
+  end
+
+  context 'when instance_level_integration_overrides is disabled' do
+    before do
+      stub_feature_flags(instance_level_integration_overrides: false)
+      visit_instance_integration('Mattermost slash commands')
+    end
+
+    it 'does not display the overrides tab' do
+      expect(page).not_to have_link('Settings', href: edit_path)
+      expect(page).not_to have_link('Projects using custom settings', href: overrides_path)
+    end
+  end
 end
diff --git a/spec/features/merge_request/user_sees_closing_issues_message_spec.rb b/spec/features/merge_request/user_sees_closing_issues_message_spec.rb
index d6cdc15005b..7b7fff5c936 100644
--- a/spec/features/merge_request/user_sees_closing_issues_message_spec.rb
+++ b/spec/features/merge_request/user_sees_closing_issues_message_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe 'Merge request > User sees closing issues message', :js do
     let(:merge_request_description) { "Description\n\nclosing #{issue_1.to_reference}, #{issue_2.to_reference}" }
 
     it 'does not display closing issue message' do
-      expect(page).to have_content("Closes #{issue_1.to_reference} and #{issue_2.to_reference}")
+      expect(page).to have_content("Closes issues #{issue_1.to_reference} and #{issue_2.to_reference}")
     end
   end
 
@@ -39,7 +39,7 @@ RSpec.describe 'Merge request > User sees closing issues message', :js do
     let(:merge_request_description) { "Description\n\nRefers to #{issue_1.to_reference} and #{issue_2.to_reference}" }
 
     it 'does not display closing issue message' do
-      expect(page).to have_content("Mentions #{issue_1.to_reference} and #{issue_2.to_reference}")
+      expect(page).to have_content("Mentions issues #{issue_1.to_reference} and #{issue_2.to_reference}")
     end
   end
 
@@ -47,8 +47,8 @@ RSpec.describe 'Merge request > User sees closing issues message', :js do
     let(:merge_request_title) { "closes #{issue_1.to_reference}\n\n refers to #{issue_2.to_reference}" }
 
     it 'does not display closing issue message' do
-      expect(page).to have_content("Closes #{issue_1.to_reference}")
-      expect(page).to have_content("Mentions #{issue_2.to_reference}")
+      expect(page).to have_content("Closes issue #{issue_1.to_reference}")
+      expect(page).to have_content("Mentions issue #{issue_2.to_reference}")
     end
   end
 
@@ -56,7 +56,7 @@ RSpec.describe 'Merge request > User sees closing issues message', :js do
     let(:merge_request_title) { "closing #{issue_1.to_reference}, #{issue_2.to_reference}" }
 
     it 'does not display closing issue message' do
-      expect(page).to have_content("Closes #{issue_1.to_reference} and #{issue_2.to_reference}")
+      expect(page).to have_content("Closes issues #{issue_1.to_reference} and #{issue_2.to_reference}")
     end
   end
 
@@ -64,7 +64,7 @@ RSpec.describe 'Merge request > User sees closing issues message', :js do
     let(:merge_request_title) { "Refers to #{issue_1.to_reference} and #{issue_2.to_reference}" }
 
     it 'does not display closing issue message' do
-      expect(page).to have_content("Mentions #{issue_1.to_reference} and #{issue_2.to_reference}")
+      expect(page).to have_content("Mentions issues #{issue_1.to_reference} and #{issue_2.to_reference}")
     end
   end
 
@@ -72,8 +72,8 @@ RSpec.describe 'Merge request > User sees closing issues message', :js do
     let(:merge_request_title) { "closes #{issue_1.to_reference}\n\n refers to #{issue_2.to_reference}" }
 
     it 'does not display closing issue message' do
-      expect(page).to have_content("Closes #{issue_1.to_reference}")
-      expect(page).to have_content("Mentions #{issue_2.to_reference}")
+      expect(page).to have_content("Closes issue #{issue_1.to_reference}")
+      expect(page).to have_content("Mentions issue #{issue_2.to_reference}")
     end
   end
 end