Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb b/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb
index cfa043322db..4c312b42c0a 100644
--- a/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb
+++ b/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb
@@ -18,7 +18,7 @@ RSpec.shared_examples 'user activates the Mattermost Slash Command integration'
     click_active_checkbox
     click_save_integration
 
-    expect(current_path).to eq(edit_path)
+    expect(page).to have_current_path(edit_path, ignore_query: true)
     expect(page).to have_content('Mattermost slash commands settings saved, but not active.')
   end
 
@@ -28,7 +28,7 @@ RSpec.shared_examples 'user activates the Mattermost Slash Command integration'
     fill_in 'service_token', with: token
     click_save_integration
 
-    expect(current_path).to eq(edit_path)
+    expect(page).to have_current_path(edit_path, ignore_query: true)
     expect(page).to have_content('Mattermost slash commands settings saved and active.')
   end
 end