capybara 2.4.4 → 2.5.0

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

@@ -0,0 +1,23 @@
+Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
+  before do
+    @session.visit '/foo'
+  end
+
+  it "generates sensible filename" do
+    allow(@session.driver).to receive(:save_screenshot)
+
+    @session.save_screenshot
+
+    regexp = Regexp.new(File.expand_path('capybara-\d+\.png'))
+    expect(@session.driver).to have_received(:save_screenshot).with(regexp, {})
+  end
+
+  it "allows to specify another path" do
+    allow(@session.driver).to receive(:save_screenshot)
+
+    custom_path = 'screenshots/1.png'
+    @session.save_screenshot(custom_path)
+
+    expect(@session.driver).to have_received(:save_screenshot).with(custom_path, {})
+  end
+end

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

@@ -108,6 +108,18 @@ Capybara::SpecHelper.spec "#select" do
     end
   end
 
+  context "on a disabled option" do
+    it "should not select" do
+      @session.select('Other', :from => 'form_title')
+      expect(@session.find_field('form_title').value).not_to eq 'Other'
+    end
+
+    it "should warn" do
+      expect_any_instance_of(Capybara::Node::Element).to receive(:warn).once
+      @session.select('Other', :from => 'form_title')
+    end
+  end
+
   context "with multiple select" do
     it "should return an empty value" do
       expect(@session.find_field('Language').value).to eq([])

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

@@ -1,13 +1,13 @@
 Capybara::SpecHelper.spec '#title' do
 
-  it "should print the title of the page" do
+  it "should get the title of the page" do
     @session.visit('/with_title')
     expect(@session.title).to eq('Test Title')
   end
 
   context "with css as default selector" do
     before { Capybara.default_selector = :css }
-    it "should print the title of the page" do
+    it "should get the title of the page" do
       @session.visit('/with_title')
       expect(@session.title).to eq('Test Title')
     end

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

@@ -37,7 +37,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
   end
 
   context 'without :wait option' do
-    it 'should wait if value of default_wait_time is more than timeout' do
+    it 'should wait if value of default_max_wait_time is more than timeout' do
       @session.within_window @other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 500);')
       end
@@ -46,7 +46,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
       end
     end
 
-    it 'should raise error if value of default_wait_time is less than timeout' do
+    it 'should raise error if value of default_max_wait_time is less than timeout' do
       @session.within_window @other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 900);')
       end
@@ -59,7 +59,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
   end
 
   context 'with not_to' do
-    it 'should raise error if default_wait_time is more than timeout' do
+    it 'should raise error if default_max_wait_time is more than timeout' do
       @session.within_window @other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 700);')
       end
@@ -70,7 +70,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
       end
     end
 
-    it 'should raise error if default_wait_time is more than timeout' do
+    it 'should raise error if default_max_wait_time is more than timeout' do
       @session.within_window @other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 700);')
       end

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

@@ -46,6 +46,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
     end
 
     it "should be able to switch to current window" do
@@ -111,4 +112,11 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
       expect(@session.current_window).to eq(original)
     end
   end
+
+  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'}
+    end.not_to raise_error
+  end
 end

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

@@ -18,9 +18,10 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
     it 'should raise error if value of :wait is less than timeout' do
       # So large value is used as `driver.window_handles` takes up to 800 ms on Travis
       Capybara.using_wait_time 2 do
+        button=@session.find(:css, '#openWindowWithLongerTimeout')
         expect do
           @session.window_opened_by(wait: 0.8) do
-            @session.find(:css, '#openWindowWithLongerTimeout').click
+            button.click
           end
         end.to raise_error(Capybara::WindowError, zero_windows_message)
       end
@@ -30,9 +31,10 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
     end
 
     it 'should find window if value of :wait is more than timeout' do
+      button = @session.find(:css, '#openWindowWithTimeout')
       Capybara.using_wait_time 0.1 do
         window = @session.window_opened_by(wait: 1.5) do
-          @session.find(:css, '#openWindowWithTimeout').click
+          button.click
         end
         expect(window).to be_instance_of(Capybara::Window)
       end
@@ -40,11 +42,12 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
   end
 
   context 'without :wait option' do
-    it 'should raise error if default_wait_time is less than timeout' 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
         expect do
           @session.window_opened_by do
-            @session.find(:css, '#openWindowWithTimeout').click
+            button.click
           end
         end.to raise_error(Capybara::WindowError, zero_windows_message)
       end
@@ -53,10 +56,11 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
       end
     end
 
-    it 'should find window if default_wait_time is more than timeout' 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
         window = @session.window_opened_by do
-          @session.find(:css, '#openWindowWithTimeout').click
+          button.click
         end
         expect(window).to be_instance_of(Capybara::Window)
       end
@@ -64,9 +68,10 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
   end
 
   it 'should raise error when two windows have been opened by block' do
+    button = @session.find(:css, '#openTwoWindows')
     expect do
       @session.window_opened_by do
-        @session.find(:css, '#openTwoWindows').click
+        button.click
       end
     end.to raise_error(Capybara::WindowError, two_windows_message)
     @session.document.synchronize(2, errors: [Capybara::CapybaraError]) do
@@ -75,9 +80,10 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
   end
 
   it 'should raise error when no windows were opened by block' do
+    button = @session.find(:css, '#doesNotOpenWindows')
     expect do
       @session.window_opened_by do
-        @session.find(:css, '#doesNotOpenWindows').click
+        button.click
       end
     end.to raise_error(Capybara::WindowError, zero_windows_message)
   end

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

@@ -86,10 +86,14 @@ 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
@@ -104,23 +108,32 @@ 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])
     end
 
-    it 'should switch to original window if invoked not for current window' do
+    it 'should stay on current window if invoked not for current window', requires: [:windows, :js] do
+
       @other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
       @other_window.resize_to(400, 300)
       expect(@session.current_window).to eq(@window)
-      expect(@other_window.size).to eq([400, 300])
+
+      # #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])
+      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)
+
       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)
@@ -130,13 +143,20 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
       expect(@session.evaluate_script("[window.outerWidth, window.outerHeight];")).to eq([screen_width, screen_height])
     end
 
-    it 'should switch to original window if invoked not for current window', requires: [:windows, :js] do
+    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
       @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)
-      expect(@other_window.size).to eq(@session.evaluate_script("[window.screen.availWidth, window.screen.availHeight];"))
+      # #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
     end
   end
 end

data/lib/capybara/spec/spec_helper.rb

@@ -26,13 +26,14 @@ module Capybara
         Capybara.app = TestApp
         Capybara.app_host = nil
         Capybara.default_selector = :xpath
-        Capybara.default_wait_time = 1
+        Capybara.default_max_wait_time = 1
         Capybara.ignore_hidden_elements = true
         Capybara.exact = false
         Capybara.exact_options = false
         Capybara.raise_server_errors = true
         Capybara.visible_text_only = false
         Capybara.match = :smart
+        Capybara.wait_on_first_by_default = false
       end
 
       def filter(requires, metadata)
@@ -88,6 +89,7 @@ module Capybara
     end
 
     def extract_results(session)
+      expect(session).to have_xpath("//pre[@id='results']")
       YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.inner_html.lstrip
     end
   end

data/lib/capybara/spec/test_app.rb

@@ -1,4 +1,5 @@
 require 'sinatra/base'
+require 'tilt/erb'
 require 'rack'
 require 'yaml'
 
@@ -123,8 +124,16 @@ class TestApp < Sinatra::Base
     raise TestAppError, "some error"
   end
 
+  get '/load_error' do
+    raise LoadError
+  end
+
+  get '/with.*html' do
+    erb :with_html, locals: { referrer: request.referrer }
+  end
+
   get '/:view' do |view|
-    erb view.to_sym
+    erb view.to_sym, locals: { referrer: request.referrer }
   end
 
   post '/form' do

data/lib/capybara/spec/views/form.erb

@@ -161,7 +161,7 @@ New line after and before textarea tag
     <input type="checkbox" value="hamster" name="form[pets][]" id="form_pets_hamster" checked="checked"/>
     <label for="form_pets_hamster">Hamster</label>
   </p>
-  
+
   <p>
     <input type="checkbox" name="form[valueless_checkbox]" id="valueless_checkbox" checked="checked"/>
     <label for="valueless_checkbox">Valueless Checkbox</label>
@@ -289,6 +289,11 @@ New line after and before textarea tag
     <button id="no_type">No Type!</button>
     <input type="button" disabled="disabled" value="Disabled button"/>
   </p>
+
+  <p>
+    <input id="readonly" name="form[readonly_test]" readonly/>
+    <input id="not_readonly" name="form[readonly_test]" />
+  </p>
 </form>
 
 <input type="text" name="form[outside_input]" value="outside_input" form="form1"/>
@@ -434,6 +439,7 @@ New line after and before textarea tag
     <input type="text" name="form[which_form]" value="formaction form"/>
   </p>
   <input type="submit" name="form[button]" formaction="/form" value="Formaction button"/>
+  <input type="submit" name="form[button]" formaction="/form/get" formmethod="get" value="Formmethod button"/>
 </form>
 
 <form action="relative" method="post">

data/lib/capybara/spec/views/path.erb

@@ -0,0 +1,12 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+  <body>
+    <div>
+      <a href="#">First Link</a>
+    </div>
+    Text node
+    <div>
+      <a href="#">Second Link</a>
+      <a href="#">Third Link</a>
+    </div>
+  </body>
+</html>

data/lib/capybara/spec/views/with_html.erb

@@ -1,3 +1,4 @@
+<div id="referrer"><%= referrer %></div>
 <h1>This is a test</h1>
 
 <h2 class="no text"></h2>
@@ -45,6 +46,7 @@ banana</textarea>
   <a>No Href</a>
   <a href="">Blank Href</a>
   <a href="#">Blank Anchor</a>
+  <a href="javascript:void(0)">Blank JS Anchor</a>
   <a href="#anchor">Normal Anchor</a>
   <a href="/with_simple_html#anchor">Anchor on different page</a>
   <a href="/with_html#anchor">Anchor on same page</a>

data/lib/capybara/spec/views/with_js.erb

@@ -69,7 +69,7 @@
     <p>
       <a href="#" id="change-title">Change title</a>
     </p>
-        
+
     <p id="click-test">Click me</p>
 
     <p>
@@ -89,6 +89,14 @@
       <a href="#" id="open-prompt">Open prompt</a>
     </p>
 
+    <p>
+      <a href="#" id="delayed-page-change">Change page</a>
+    </p>
+
+    <p>
+      <input type="test" name="with-key-events" id="with-key-events">
+      <p id="key-events-output"></p>
+    </p>
     <script type="text/javascript">
       // a javascript comment
       var aVar = 123;

data/lib/capybara/spec/views/with_title.erb

@@ -1 +1,4 @@
-<title>Test Title</title>
+<title>Test Title</title>
+<body>
+  <svg><title>abcdefg</title></svg>
+</body>

data/lib/capybara/spec/views/with_windows.erb

@@ -11,14 +11,14 @@
 
       $('#openWindowWithTimeout').click(function(){
         setTimeout(function(){
-          window.open('/popup_one', 'firstPopup');
+          window.open('/popup_one', 'timeoutPopup');
         }, 600);
         return false;
       });
 
       $('#openWindowWithLongerTimeout').click(function(){
         setTimeout(function(){
-          window.open('/popup_one', 'firstPopup');
+          window.open('/popup_one', 'longerTimeoutPopup');
         }, 1400);
         return false;
       });

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '2.4.4'
+  VERSION = '2.5.0'
 end

data/spec/basic_node_spec.rb

@@ -9,6 +9,7 @@ RSpec.describe Capybara do
             <title>simple_node</title>
           </head>
           <body>
+            <svg><title>not document title</title></svg>
             <div id="page">
               <div id="content">
                 <h1 data="fantastic">Totally awesome</h1>

data/spec/capybara_spec.rb

@@ -1,15 +1,24 @@
 require 'spec_helper'
 
 RSpec.describe Capybara do
-  describe 'default_wait_time' do
+  describe 'default_max_wait_time' do
     after do
-      Capybara.default_wait_time = @previous_default_time
+      Capybara.default_max_wait_time = @previous_default_time
     end
 
     it "should be changeable" do
-      @previous_default_time = Capybara.default_wait_time
+      @previous_default_time = Capybara.default_max_wait_time
+      Capybara.default_max_wait_time = 5
+      expect(Capybara.default_max_wait_time).to eq(5)
+    end
+
+    it "should be accesible as the deprecated default_wait_time" do
+      expect_any_instance_of(Kernel).to receive(:warn).once.with('DEPRECATED: #default_wait_time= is deprecated, please use #default_max_wait_time= instead')
+      expect_any_instance_of(Kernel).to receive(:warn).once.with('DEPRECATED: #default_wait_time is deprecated, please use #default_max_wait_time instead')
+      @previous_default_time = Capybara.default_max_wait_time
       Capybara.default_wait_time = 5
       expect(Capybara.default_wait_time).to eq(5)
+      expect(Capybara.default_max_wait_time).to eq(5)
     end
   end