capybara 2.5.0 → 2.18.0

data/lib/capybara/spec/session/uncheck_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec "#uncheck" do
   before do
     @session.visit('/form')
@@ -26,15 +27,54 @@ Capybara::SpecHelper.spec "#uncheck" do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.uncheck('Ham', :exact => false)
+      @session.uncheck('Ham', exact:  false)
       @session.click_button('awesome')
       expect(extract_results(@session)['pets']).not_to include('hamster')
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.uncheck('Ham', :exact => true)
+        @session.uncheck('Ham', exact:  true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  context "when checkbox hidden" do
+    context "with Capybara.automatic_label_click == true" do
+      around do |spec|
+        old_click_label, Capybara.automatic_label_click = Capybara.automatic_label_click, true
+        spec.run
+        Capybara.automatic_label_click = old_click_label
+      end
+
+      it "should uncheck via clicking the label with :for attribute if possible" do
+        expect(@session.find(:checkbox, 'form_cars_jaguar', checked: true, visible: :hidden)).to be
+        @session.uncheck('form_cars_jaguar')
+        @session.click_button('awesome')
+        expect(extract_results(@session)['cars']).not_to include('jaguar')
+      end
+
+      it "should uncheck via clicking the wrapping label if possible" do
+        expect(@session.find(:checkbox, 'form_cars_koenigsegg', checked: true, visible: :hidden)).to be
+        @session.uncheck('form_cars_koenigsegg')
+        @session.click_button('awesome')
+        expect(extract_results(@session)['cars']).not_to include('koenigsegg')
+      end
+
+      it "should not click the label if unneeded" do
+        expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+        @session.uncheck('form_cars_tesla')
+        @session.click_button('awesome')
+        expect(extract_results(@session)['cars']).not_to include('tesla')
+      end
+
+      it "should raise original error when no label available" do
+        expect { @session.uncheck('form_cars_ariel') }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_ariel" that is not disabled')
+      end
+
+      it "should raise error if not allowed to click label" do
+        expect{@session.uncheck('form_cars_jaguar', allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_jaguar" that is not disabled')
+      end
+    end
+  end
 end

data/lib/capybara/spec/session/unselect_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec "#unselect" do
   before do
     @session.visit('/form')
@@ -5,7 +6,7 @@ Capybara::SpecHelper.spec "#unselect" do
 
   context "with multiple select" do
     it "should unselect an option from a select box by id" do
-      @session.unselect('Commando', :from => 'form_underwear')
+      @session.unselect('Commando', from: 'form_underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Briefs', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Commando')
@@ -19,27 +20,27 @@ Capybara::SpecHelper.spec "#unselect" do
     end
 
     it "should unselect an option from a select box by label" do
-      @session.unselect('Commando', :from => 'Underwear')
+      @session.unselect('Commando', from: 'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Briefs', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Commando')
     end
 
     it "should favour exact matches to option labels" do
-      @session.unselect("Briefs", :from => 'Underwear')
+      @session.unselect("Briefs", from: 'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Commando', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Briefs')
     end
 
     it "should escape quotes" do
-      @session.unselect("Frenchman's Pantalons", :from => 'Underwear')
+      @session.unselect("Frenchman's Pantalons", from: 'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).not_to include("Frenchman's Pantalons")
     end
 
     it "casts to string" do
-      @session.unselect(:"Briefs", :from => :'Underwear')
+      @session.unselect(:"Briefs", from: :'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Commando', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Briefs')
@@ -48,24 +49,24 @@ Capybara::SpecHelper.spec "#unselect" do
 
   context "with single select" do
     it "should raise an error" do
-      expect { @session.unselect("English", :from => 'form_locale') }.to raise_error(Capybara::UnselectNotAllowed)
+      expect { @session.unselect("English", from: 'form_locale') }.to raise_error(Capybara::UnselectNotAllowed)
     end
   end
 
   context "with a locator that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find select box \"does not exist\""
+      msg = "Unable to find visible select box \"does not exist\" that is not disabled"
       expect do
-        @session.unselect('foo', :from => 'does not exist')
+        @session.unselect('foo', from: 'does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
 
   context "with an option that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find option \"Does not Exist\""
+      msg = /^Unable to find visible option "Does not Exist" within/
       expect do
-        @session.unselect('Does not Exist', :from => 'form_underwear')
+        @session.unselect('Does not Exist', from: 'form_underwear')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
@@ -73,19 +74,19 @@ Capybara::SpecHelper.spec "#unselect" do
   context "with :exact option" do
     context "when `false`" do
       it "can match select box approximately" do
-        @session.unselect("Boxerbriefs", :from => "Under", :exact => false)
+        @session.unselect("Boxerbriefs", from: "Under", exact:  false)
         @session.click_button("awesome")
         expect(extract_results(@session)["underwear"]).not_to include("Boxerbriefs")
       end
 
       it "can match option approximately" do
-        @session.unselect("Boxerbr", :from => "Underwear", :exact => false)
+        @session.unselect("Boxerbr", from: "Underwear", exact:  false)
         @session.click_button("awesome")
         expect(extract_results(@session)["underwear"]).not_to include("Boxerbriefs")
       end
 
       it "can match option approximately when :from not given" do
-        @session.unselect("Boxerbr", :exact => false)
+        @session.unselect("Boxerbr", exact:  false)
         @session.click_button("awesome")
         expect(extract_results(@session)["underwear"]).not_to include("Boxerbriefs")
       end
@@ -94,19 +95,19 @@ Capybara::SpecHelper.spec "#unselect" do
     context "when `true`" do
       it "can match select box approximately" do
         expect do
-          @session.unselect("Boxerbriefs", :from => "Under", :exact => true)
+          @session.unselect("Boxerbriefs", from: "Under", exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
 
       it "can match option approximately" do
         expect do
-          @session.unselect("Boxerbr", :from => "Underwear", :exact => true)
+          @session.unselect("Boxerbr", from: "Underwear", exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
 
       it "can match option approximately when :from not given" do
         expect do
-          @session.unselect("Boxerbr", :exact => true)
+          @session.unselect("Boxerbr", exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
     end

data/lib/capybara/spec/session/visit_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#visit' do
   it "should fetch a response from the driver with a relative url" do
     @session.visit('/')
@@ -26,7 +27,7 @@ Capybara::SpecHelper.spec '#visit' do
     expect(@session).to have_content('Hello world!')
   end
 
-  it "raises any errors caught inside the server", :requires => [:server] do
+  it "raises any errors caught inside the server", requires: [:server] do
     quietly { @session.visit("/error") }
     expect do
       @session.visit("/")
@@ -62,9 +63,59 @@ Capybara::SpecHelper.spec '#visit' do
       expect(URI.parse(@session.current_url).port).to eq(root_uri.port)
       expect(@session).to have_content('Another World')
     end
+
+    it "should add the server port to a visited url if no port specified", requires: [:server] do
+      expect(@session.driver).to receive(:visit).with("http://www.example.com:#{@session.server.port}")
+      @session.visit("http://www.example.com")
+    end
+
+    it "should not override the visit specified port even if default for scheme", requires: [:server] do
+      expect(@session.driver).to receive(:visit).with("http://www.example.com:80")
+      @session.visit('http://www.example.com:80')
+    end
+
+    it "should give preference to app_host port if specified", requires: [:server] do
+      Capybara.app_host = "http://www.example.com:6666"
+      expect(@session.driver).to receive(:visit).with("http://www.example.com:6666/random")
+      @session.visit('/random')
+    end
+
+    it "shouldn't override port if no server", requires: [:server] do
+      session = Capybara::Session.new(@session.mode, nil)
+      expect(session.driver).to receive(:visit).with("http://www.google.com")
+      session.visit("http://www.google.com")
+    end
+
+    it "shouldn't override port if no server but app_host is set", requires: [:server] do
+      session = Capybara::Session.new(@session.mode, nil)
+      Capybara.app_host = "http://www.example.com:6666"
+      expect(session.driver).to receive(:visit).with("http://www.google.com")
+      session.visit("http://www.google.com")
+    end
+  end
+
+  context "when Capybara.always_include_port is false" do
+    before(:each) do
+      Capybara.always_include_port = false
+    end
+
+    it "shouldn't overwrite port if app_host is set", requires: [:server] do
+      session = Capybara::Session.new(@session.mode, nil)
+      Capybara.app_host = "http://www.example.com:6666"
+      expect(session.driver).to receive(:visit).with("http://www.google.com")
+      session.visit("http://www.google.com")
+    end
+
+    it "shouldn't overwrite port if port specfified", requires: [:server] do
+      session = Capybara::Session.new(@session.mode, nil)
+      Capybara.app_host = "http://www.example.com:6666"
+      expect(session.driver).to receive(:visit).with("http://www.google.com:99")
+      session.visit("http://www.google.com:99")
+    end
   end
 
-  context "without a server", :requires => [:server] do
+
+  context "without a server", requires: [:server] do
     it "should respect `app_host`" do
       serverless_session = Capybara::Session.new(@session.mode, nil)
       Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}"
@@ -79,6 +130,30 @@ Capybara::SpecHelper.spec '#visit' do
     end
   end
 
+  context "with Capybara.app_host set" do
+    it "should override server", requires: [:server] do
+      another_session = Capybara::Session.new(@session.mode, @session.app.dup)
+      Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}"
+      another_session.visit('/foo')
+      expect(another_session).to have_content("Another World")
+      expect(another_session.current_url).to start_with(Capybara.app_host)
+      expect(URI.parse(another_session.current_url).port).not_to eq another_session.server.port
+      expect(URI.parse(another_session.current_url).port).to eq @session.server.port
+    end
+
+    it "should append relative path", requires: [:server] do
+      Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}/redirect/0"
+      @session.visit('/times')
+      expect(@session).to have_content('redirection complete')
+    end
+
+    it "should work if `app_host` has a trailing /", requires: [:server] do
+      Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}/"
+      @session.visit('/')
+      expect(@session).to have_content('Hello world!')
+    end
+  end
+
   it "should send no referer when visiting a page" do
     @session.visit '/get_referer'
     expect(@session).to have_content 'No referer'

data/lib/capybara/spec/session/window/become_closed_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
   before(:each) do
     @window = @session.current_window
@@ -20,18 +21,18 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
         @session.execute_script('setTimeout(function(){ window.close(); }, 500);')
       end
       Capybara.using_wait_time 0.1 do
-        expect(@other_window).to become_closed(wait: 2)
+        expect(@other_window).to become_closed(wait: 5)
       end
     end
 
     it 'should raise error if value of :wait is less than timeout' do
       @session.within_window @other_window do
-        @session.execute_script('setTimeout(function(){ window.close(); }, 700);')
+        @session.execute_script('setTimeout(function(){ window.close(); }, 1000);')
       end
       Capybara.using_wait_time 2 do
         expect do
-          expect(@other_window).to become_closed(wait: 0.4)
-        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> to become closed after 0.4 seconds\Z/)
+          expect(@other_window).to become_closed(wait: 0.2)
+        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> to become closed after 0.2 seconds\Z/)
       end
     end
   end
@@ -41,7 +42,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
       @session.within_window @other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 500);')
       end
-      Capybara.using_wait_time 1.5 do
+      Capybara.using_wait_time 5 do
         expect(@other_window).to become_closed
       end
     end
@@ -59,25 +60,25 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
   end
 
   context 'with not_to' do
-    it 'should raise error if default_max_wait_time is more than timeout' do
+    it "should not raise error if window doesn't close before default_max_wait_time" do
       @session.within_window @other_window do
-        @session.execute_script('setTimeout(function(){ window.close(); }, 700);')
+        @session.execute_script('setTimeout(function(){ window.close(); }, 1000);')
       end
-      Capybara.using_wait_time 0.4 do
+      Capybara.using_wait_time 0.3 do
         expect do
           expect(@other_window).not_to become_closed
         end
       end
     end
 
-    it 'should raise error if default_max_wait_time is more than timeout' do
+    it 'should raise error if window closes before default_max_wait_time' do
       @session.within_window @other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 700);')
       end
-      Capybara.using_wait_time 1.1 do
+      Capybara.using_wait_time 3.1 do
         expect do
           expect(@other_window).not_to become_closed
-        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> not to become closed after 1.1 seconds\Z/)
+        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> not to become closed after 3.1 seconds\Z/)
       end
     end
   end

data/lib/capybara/spec/session/window/current_window_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#current_window', requires: [:windows] do
   before(:each) do
     @window = @session.current_window

data/lib/capybara/spec/session/window/open_new_window_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#open_new_window', requires: [:windows] do
   before(:each) do
     @window = @session.current_window

data/lib/capybara/spec/session/window/switch_to_window_spec.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
   before(:each) do
     @window = @session.current_window
     @session.visit('/with_windows')
+    expect(@session).to have_css('body.loaded')
   end
+
   after(:each) do
     (@session.windows - [@window]).each do |w|
       @session.switch_to_window w
@@ -46,7 +49,7 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
   context "with block" do
     before(:each) do
       @session.find(:css, '#openTwoWindows').click
-      sleep(0.2) # wait for the windows to open
+      sleep(1) # wait for the windows to open
     end
 
     it "should be able to switch to current window" do
@@ -76,7 +79,7 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
         @session.within(:css, '#doesNotOpenWindows') do
           @session.switch_to_window { @session.title == 'With Windows' }
         end
-      end.to raise_error(Capybara::ScopeError, "`switch_to_window` is not supposed to be invoked from `within`'s, `within_frame`'s' or `within_window`'s' block.")
+      end.to raise_error(Capybara::ScopeError, /`switch_to_window` is not supposed to be invoked/)
     end
 
     it "should raise error when invoked inside `within_frame` as it's nonsense" do
@@ -84,16 +87,18 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
         @session.within_frame('frameOne') do
           @session.switch_to_window { @session.title == 'With Windows' }
         end
-      end.to raise_error(Capybara::ScopeError, "`switch_to_window` is not supposed to be invoked from `within`'s, `within_frame`'s' or `within_window`'s' block.")
+      end.to raise_error(Capybara::ScopeError, /`switch_to_window` is not supposed to be invoked from/)
     end
 
-    it "should raise error when invoked inside `within_window` as it's nonsense" do
-      window = (@session.windows - [@window]).first
-      expect do
-        @session.within_window window do
-          @session.switch_to_window { @session.title == 'With Windows' }
-        end
-      end.to raise_error(Capybara::ScopeError, "`switch_to_window` is not supposed to be invoked from `within`'s, `within_frame`'s' or `within_window`'s' block.")
+    it "should allow to be called inside within_window and within_window will still return to original" do
+      other_windows = (@session.windows - [@window])
+      expect(@session.current_window).to eq(@window)
+      @session.within_window other_windows[0] do
+        expect(@session.current_window).to eq(other_windows[0])
+        @session.switch_to_window other_windows[1]
+        expect(@session.current_window).to eq(other_windows[1])
+      end
+      expect(@session.current_window).to eq(@window)
     end
 
     it "should raise error if window matching block wasn't found" do
@@ -116,7 +121,7 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
   it "should wait for window to appear" do
     @session.find(:css, '#openWindowWithTimeout').click
     expect do
-      @session.switch_to_window { @session.title == 'Title of the first popup'}
+      @session.switch_to_window(wait: 5) { @session.title == 'Title of the first popup'}
     end.not_to raise_error
   end
 end

data/lib/capybara/spec/session/window/window_opened_by_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
   before(:each) do
     @window = @session.current_window
     @session.visit('/with_windows')
+    expect(@session).to have_css('body.loaded')
   end
   after(:each) do
     (@session.windows - [@window]).each do |w|
@@ -20,12 +22,12 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
       Capybara.using_wait_time 2 do
         button=@session.find(:css, '#openWindowWithLongerTimeout')
         expect do
-          @session.window_opened_by(wait: 0.8) do
+          @session.window_opened_by(wait: 0.3) do
             button.click
           end
         end.to raise_error(Capybara::WindowError, zero_windows_message)
       end
-      @session.document.synchronize(2, errors: [Capybara::CapybaraError]) do
+      @session.document.synchronize(5, errors: [Capybara::CapybaraError]) do
         raise Capybara::CapybaraError if @session.windows.size != 2
       end
     end
@@ -44,7 +46,7 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
   context 'without :wait option' do
     it 'should raise error if default_max_wait_time is less than timeout' do
       button = @session.find(:css, '#openWindowWithTimeout')
-      Capybara.using_wait_time 0.4 do
+      Capybara.using_wait_time 0.1 do
         expect do
           @session.window_opened_by do
             button.click
@@ -58,7 +60,7 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
 
     it 'should find window if default_max_wait_time is more than timeout' do
       button = @session.find(:css, '#openWindowWithTimeout')
-      Capybara.using_wait_time 1.5 do
+      Capybara.using_wait_time 5 do
         window = @session.window_opened_by do
           button.click
         end
@@ -72,6 +74,7 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
     expect do
       @session.window_opened_by do
         button.click
+        sleep 1 # It's possible for window_opened_by to be fullfilled before the second window opens
       end
     end.to raise_error(Capybara::WindowError, two_windows_message)
     @session.document.synchronize(2, errors: [Capybara::CapybaraError]) do

data/lib/capybara/spec/session/window/window_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   before(:each) do
     @window = @session.current_window
@@ -85,22 +86,22 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   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)
+    def win_size
+      @session.evaluate_script("[window.outerWidth || window.innerWidth, window.outerHeight || window.innerHeight]")
+    end
 
-      expect(@session.current_window.size).to eq @session.evaluate_script("[window.outerWidth, window.outerHeight];")
+    it 'should return size of whole window', requires: [:windows, :js] do
+      expect(@session.current_window.size).to eq win_size
     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
-      size =
-        @session.within_window @other_window do
-          @session.evaluate_script("[window.outerWidth, window.outerHeight];")
-        end
+      sleep 1
+      size = @session.within_window(@other_window) do
+        win_size
+      end
       expect(@other_window.size).to eq(size)
       expect(@session.current_window).to eq(@window)
     end
@@ -108,10 +109,10 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
 
   describe '#resize_to' do
     it 'should be able to resize window', requires: [:windows, :js] do
-
-      width, height = @session.evaluate_script("[window.outerWidth, window.outerHeight];")
-      @session.current_window.resize_to(width-10, height-10)
-      expect(@session.evaluate_script("[window.outerWidth, window.outerHeight];")).to eq([width-10, height-10])
+      width, height = @session.current_window.size
+      @session.current_window.resize_to(width-100, height-100)
+      sleep 1
+      expect(@session.current_window.size).to eq([width-100, height-100])
     end
 
     it 'should stay on current window if invoked not for current window', requires: [:windows, :js] do
@@ -123,40 +124,46 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
       expect(@session.current_window).to eq(@window)
 
       # #size returns values larger than availWidth, availHeight with Chromedriver
-      # expect(@other_window.size).to eq([400, 300])
       @session.within_window(@other_window) do
-        expect(@session.evaluate_script("[window.outerWidth, window.outerHeight]")).to eq([400,300])
+        expect(@session.current_window.size).to eq([400,300])
+        # expect(@session.evaluate_script("[window.outerWidth, window.outerHeight]")).to eq([400,300])
       end
     end
   end
 
   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)
+      start_width, start_height = 400, 300
+      @session.current_window.resize_to(start_width, start_height)
+      sleep 0.5
 
-      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)
-      expect(@session.evaluate_script("[window.outerWidth, window.outerHeight];")).to eq([screen_width-100, screen_height-100])
-      window.maximize
+      @session.current_window.maximize
       sleep 0.5  # The timing on maximize is finicky on Travis -- wait a bit for maximize to occur
-      expect(@session.evaluate_script("[window.outerWidth, window.outerHeight];")).to eq([screen_width, screen_height])
+
+      max_width, max_height = @session.current_window.size
+
+      #maximize behavior is window manage dependant, so just make sure it increases in size
+      expect(max_width).to be > start_width
+      expect(max_height).to be > start_height
     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)
-
+      cur_window_size = @session.current_window.size
       @other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
+
+      @other_window.resize_to(400,300)
+      sleep 0.5
       @other_window.maximize
       sleep 0.5 # The timing on maximize is finicky on Travis -- wait a bit for maximize to occur
+
       expect(@session.current_window).to eq(@window)
-      # #size returns values larger than availWidth, availHeight with Chromedriver
-      # expect(@other_window.size).to eq(@session.evaluate_script("[window.screen.availWidth, window.screen.availHeight];"))
-      @session.within_window(@other_window) do
-        expect(@session.evaluate_script("[window.outerWidth, window.outerHeight]")).to eq(@session.evaluate_script("[window.screen.availWidth, window.screen.availHeight];"))
-      end
+      expect(@session.current_window.size).to eq(cur_window_size)
+
+      ow_width, ow_height = @other_window.size
+      expect(ow_width).to be > 400
+      expect(ow_height).to be > 300
     end
   end
 end

data/lib/capybara/spec/session/window/windows_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#windows', requires: [:windows] do
   before(:each) do
     @window = @session.current_window