From 3f3875dbf93b5e6b02d3f4320145f5a5bd8b42dc Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 1 Nov 2017 14:04:24 -0500 Subject: make window resizing more resiliant on small screens when headless mode is off --- spec/support/capybara.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index e196455206e..9f672bc92fc 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -41,13 +41,17 @@ RSpec.configure do |config| end config.before(:example, :js) do + session = Capybara.current_session + allow(Gitlab::Application.routes).to receive(:default_url_options).and_return( - host: Capybara.current_session.server.host, - port: Capybara.current_session.server.port, + host: session.server.host, + port: session.server.port, protocol: 'http') # reset window size between tests - Capybara.current_session.current_window.resize_to(1240, 1400) + unless session.current_window.size == [1240, 1400] + session.current_window.resize_to(1240, 1400) rescue nil + end end config.after(:example, :js) do |example| -- cgit v1.2.3