Commit 77d00077 authored by Sean McGivern's avatar Sean McGivern

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
parents 4d05e853 cbfdc7e3
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment