Merge branch 'rc/35599-stop-the-bleeding-of-default_url_options' into 'master'

Ensure the overriding of Gitlab::Application.routes.default_url_options is only local

See merge request !13125

1 files changed, 4 insertions, 0 deletions

diff --git a/spec/features/dashboard/issues_spec.rb b/spec/features/dashboard/issues_spec.rb
index 2a5ef08da60..ea7a9efc326 100644
--- a/spec/features/dashboard/issues_spec.rb
+++ b/spec/features/dashboard/issues_spec.rb
@@ -80,6 +80,8 @@ RSpec.describe 'Dashboard Issues', feature: true do
     end
 
     it 'shows the new issue page', js: true do
+      original_defaults = Gitlab::Application.routes.default_url_options
+
       Gitlab::Application.routes.default_url_options = {
         host: Capybara.current_session.server.host,
         port: Capybara.current_session.server.port,
@@ -95,6 +97,8 @@ RSpec.describe 'Dashboard Issues', feature: true do
       page.within('#content-body') do
         expect(page).to have_selector('.issue-form')
       end
+
+      Gitlab::Application.routes.default_url_options = original_defaults
     end
   end
 end