diff --git a/gemfiles/Gemfile.beta-versions b/gemfiles/Gemfile.beta-versions index e3580ae8..626e2b97 100644 --- a/gemfiles/Gemfile.beta-versions +++ b/gemfiles/Gemfile.beta-versions @@ -5,4 +5,4 @@ gemspec :path => '..' gem 'xpath', github: 'jnicklas/xpath' gem 'rack', github: 'rack/rack' -gem 'sinatra', github: 'sinatra/sinatra', branch: '2.2.0-alpha' \ No newline at end of file +gem 'sinatra', github: 'sinatra/sinatra', branch: 'master' \ No newline at end of file diff --git a/lib/capybara/spec/session/window/window_spec.rb b/lib/capybara/spec/session/window/window_spec.rb index 524b94dd..26728106 100644 --- a/lib/capybara/spec/session/window/window_spec.rb +++ b/lib/capybara/spec/session/window/window_spec.rb @@ -86,14 +86,10 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do describe '#size' do it 'should return size of whole window', requires: [:windows, :js] do - skip "Chromedriver returns a size larger than outerWidth, outerHeight???" if ENV['TRAVIS'] && @session.respond_to?(:mode) && (@session.mode == :selenium_chrome) - expect(@session.current_window.size).to eq @session.evaluate_script("[window.outerWidth, window.outerHeight];") end it 'should switch to original window if invoked not for current window' do - skip "Chromedriver returns a size larger than outerWidth, outerHeight???" if ENV['TRAVIS'] && @session.respond_to?(:mode) && (@session.mode == :selenium_chrome) - @other_window = @session.window_opened_by do @session.find(:css, '#openWindow').click end @@ -132,8 +128,6 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do describe '#maximize' do it 'should be able to maximize window', requires: [:windows, :js] do - skip "This test fails when run with Firefox on Travis - see issue #1493 - skipping for now" if ENV['TRAVIS'] && @session.respond_to?(:mode) && (@session.mode == :selenium_focus) - screen_width, screen_height = @session.evaluate_script("[window.screen.availWidth, window.screen.availHeight];") window = @session.current_window window.resize_to(screen_width-100, screen_height-100) @@ -144,8 +138,6 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do end it 'should stay on current window if invoked not for current window', requires: [:windows, :js] do - skip "This test fails when run with Firefox on Travis - see issue #1493 - skipping for now" if ENV['TRAVIS'] && @session.respond_to?(:mode) && (@session.mode == :selenium_focus) - @other_window = @session.window_opened_by do @session.find(:css, '#openWindow').click end