capybara 2.6.2 → 2.7.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#status_code' do
   it "should return response codes", :requires => [:status_code] do
     @session.visit('/with_simple_html')

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'launchy'
 
 Capybara::SpecHelper.spec '#save_and_open_page' do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'launchy'
 
 Capybara::SpecHelper.spec '#save_and_open_screenshot' do
@@ -25,8 +26,8 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
     @session.save_and_open_screenshot(custom_path)
 
     expect(@session.driver).to have_received(:save_screenshot).
-      with(custom_path, {})
-    expect(Launchy).to have_received(:open).with(custom_path)
+      with(/#{custom_path}$/, {})
+    expect(Launchy).to have_received(:open).with(/#{custom_path}$/)
   end
 
   context 'when launchy cannot be required' do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#save_page' do
   let(:alternative_path) { File.join(Dir.pwd, "save_and_open_page_tmp") }
   before do
@@ -6,6 +7,7 @@ Capybara::SpecHelper.spec '#save_page' do
 
   after do
     Capybara.save_and_open_page_path = nil
+    Capybara.save_path = nil
     Dir.glob("capybara-*.html").each do |file|
       FileUtils.rm(file)
     end
@@ -25,7 +27,7 @@ Capybara::SpecHelper.spec '#save_page' do
   end
 
   it "can store files in a specified directory" do
-    Capybara.save_and_open_page_path = alternative_path
+    Capybara.save_path = alternative_path
     @session.save_page
     path = Dir.glob(alternative_path + "/capybara-*.html").first
     expect(File.read(path)).to include("Another World")
@@ -36,6 +38,20 @@ Capybara::SpecHelper.spec '#save_page' do
     expect(File.read("capybara-001122.html")).to include("Another World")
   end
 
+  it "can store files in a specified directory with a given filename" do
+    Capybara.save_path = alternative_path
+    @session.save_page("capybara-001133.html")
+    path = alternative_path + "/capybara-001133.html"
+    expect(File.read(path)).to include("Another World")
+  end
+
+  it "can store files in a specified directory with a given relative filename" do
+    Capybara.save_path = alternative_path
+    @session.save_page("tmp/capybara-001144.html")
+    path = alternative_path + "/tmp/capybara-001144.html"
+    expect(File.read(path)).to include("Another World")
+  end
+
   it "returns an absolute path in pwd" do
     result = @session.save_page
     path = File.expand_path(Dir.glob("capybara-*.html").first, Dir.pwd)
@@ -43,7 +59,7 @@ Capybara::SpecHelper.spec '#save_page' do
   end
 
   it "returns an absolute path in given directory" do
-    Capybara.save_and_open_page_path = alternative_path
+    Capybara.save_path = alternative_path
     result = @session.save_page
     path = File.expand_path(Dir.glob(alternative_path + "/capybara-*.html").first, alternative_path)
     expect(result).to eq(path)
@@ -88,4 +104,20 @@ Capybara::SpecHelper.spec '#save_page' do
       expect(result).to include("Bar")
     end
   end
+
+  context "with deprecated save_and_open_page_path" do
+    it "can store files in a specified directory" do
+      Capybara.save_and_open_page_path = alternative_path
+      @session.save_page
+      path = Dir.glob(alternative_path + "/capybara-*.html").first
+      expect(File.read(path)).to include("Another World")
+    end
+
+    it "returns an absolute path in given directory" do
+      Capybara.save_and_open_page_path = alternative_path
+      result = @session.save_page
+      path = File.expand_path(Dir.glob(alternative_path + "/capybara-*.html").first, alternative_path)
+      expect(result).to eq(path)
+    end
+  end
 end

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

@@ -1,8 +1,16 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
+  let(:alternative_path) { File.join(Dir.pwd, "save_screenshot_tmp") }
   before do
     @session.visit '/foo'
   end
 
+  after do
+    Capybara.save_and_open_page_path = nil
+    Capybara.save_path = nil
+    FileUtils.rm_rf alternative_path
+  end
+
   it "generates sensible filename" do
     allow(@session.driver).to receive(:save_screenshot)
 
@@ -18,6 +26,28 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
     custom_path = 'screenshots/1.png'
     @session.save_screenshot(custom_path)
 
-    expect(@session.driver).to have_received(:save_screenshot).with(custom_path, {})
+    expect(@session.driver).to have_received(:save_screenshot).with(/#{custom_path}$/, {})
+  end
+
+  context "with Capybara.save_path" do
+    it "file is generated in the correct location" do
+      Capybara.save_path = alternative_path
+      allow(@session.driver).to receive(:save_screenshot)
+
+      @session.save_screenshot
+
+      regexp = Regexp.new(File.expand_path('capybara-\d+\.png', alternative_path))
+      expect(@session.driver).to have_received(:save_screenshot).with(regexp, {})
+    end
+
+    it "relative paths are relative to save_path" do
+      Capybara.save_path = alternative_path
+      allow(@session.driver).to receive(:save_screenshot)
+
+      custom_path = 'screenshots/2.png'
+      @session.save_screenshot(custom_path)
+
+      expect(@session.driver).to have_received(:save_screenshot).with(File.expand_path(custom_path, alternative_path), {})
+    end
   end
 end

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

@@ -1,4 +1,6 @@
-#coding: US-ASCII
+# coding: US-ASCII
+# frozen_string_literal: true
+
 Capybara::SpecHelper.spec "#save_screenshot" do
   let(:image_path) { File.join(Dir.tmpdir, 'capybara-screenshot.png') }
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec "#select" do
   before do
     @session.visit('/form')

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

@@ -0,0 +1,35 @@
+Capybara::SpecHelper.spec Capybara::Selector do
+  before do
+    @session.visit('/form')
+  end
+
+  describe ":label selector" do
+    it "finds a label by text" do
+      expect(@session.find(:label, 'Customer Name').text).to eq 'Customer Name'
+    end
+
+    it "finds a label by for attribute string" do
+      expect(@session.find(:label, for: 'form_other_title')['for']).to eq 'form_other_title'
+    end
+
+    it "finds a label from nested input using :for filter" do
+      input = @session.find(:id, 'nested_label')
+      expect(@session.find(:label, for: input).text).to eq 'Nested Label'
+    end
+
+    it "finds the label for an non-nested element when using :for filter" do
+      select = @session.find(:id, 'form_other_title')
+      expect(@session.find(:label, for: select)['for']).to eq 'form_other_title'
+    end
+
+    context "with exact option" do
+      it "matches substrings" do
+        expect(@session.find(:label, 'Customer Na', exact: false).text).to eq 'Customer Name'
+      end
+
+      it "doesn't match substrings" do
+        expect { @session.find(:label, 'Customer Na', exact: true) }.to raise_error(Capybara::ElementNotFound)
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#text' do
   it "should print the text of the page" do
     @session.visit('/with_simple_html')

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#title' do
 
   it "should get the title of the page" do
@@ -13,4 +14,4 @@ Capybara::SpecHelper.spec '#title' do
     end
     after { Capybara.default_selector = :xpath }
   end
-end
+end

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')

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')

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('/')

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

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,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
   before(:each) do
     @window = @session.current_window

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

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

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
@@ -86,14 +87,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 +129,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 +139,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

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
   before(:each) do
     @window = @session.current_window
@@ -132,9 +133,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
 
   context "with string" do
     it "should warn" do
-      expect(@session).to receive(:warn).with("DEPRECATION WARNING: Passing string argument "\
-        "to #within_window is deprecated. Pass window object or lambda. "\
-        "(called from #{__FILE__}:138)").and_call_original
+      expect(@session).to receive(:warn).with(/DEPRECATION WARNING/).and_call_original
       @session.within_window('firstPopup') {}
     end
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
   before(:each) do
     @session.visit('/within_frames')

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#within' do
   before do
     @session.visit('/with_scope')

data/lib/capybara/spec/spec_helper.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 require "rspec"
+require "rspec/expectations"
 require "capybara"
 require "capybara/rspec" # Required here instead of in rspec_spec to avoid RSpec deprecation warning
 require "capybara/spec/test_app"

data/lib/capybara/spec/test_app.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sinatra/base'
 require 'tilt/erb'
 require 'rack'

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <h1>Buttons</h1>
 <button>Click me!</button>
 <button id="click_me_123">Click me by id!</button>

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <form action="/form" method="post">
   <fieldset id="agent_fieldset">
     <legend>Agent</legend>
@@ -26,4 +27,4 @@
       <input type="submit" value="Create"/>
     </p>
   </fieldset>
-</form>
+</form>

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <h1>Form</h1>
 
 <form action="/form" method="post">
@@ -153,6 +154,10 @@ New line after and before textarea tag
     <label for="gender_both">Both</label>
   </p>
 
+  <p>
+    <input type="checkbox" id="no_attr_value_checked" value="1" checked/>
+  </p>
+
   <p>
     <input type="checkbox" value="dog" name="form[pets][]" id="form_pets_dog" checked="checked"/>
     <label for="form_pets_dog">Dog</label>
@@ -292,6 +297,16 @@ New line after and before textarea tag
     </label>
   </p>
 
+  <p>
+    <label for="form_disabled_select2">
+      Disabled Select 2
+      <select name="form[disabled_select2]" id="form_disabled_select2" disabled>
+        <option value="Should not see me" selected="selected">Should not see me</option>
+      </select>
+    </label>
+  </p>
+
+
   <p>
     <label for="form_disabled_file">
       Disabled File
@@ -318,6 +333,11 @@ New line after and before textarea tag
 
 <input type="text" name="form[outside_input]" value="outside_input" form="form1"/>
 
+<label>
+  Nested Label
+  <input type="text" name="nested_label" id="nested_label"/>
+</label>
+
 <form id="form1" action="/form" method="post">
   <input type="text" name="form[which_form]" value="form1" id="form_which_form"/>
   <input type="text" name="form[for_form2]" value="for_form2" form="form2"/>
@@ -423,6 +443,10 @@ New line after and before textarea tag
     <label for="html5_email">Html5 Email</label>
     <input type="email" name="form[html5_email]" value="person@email.com" id="html5_email"/>
   </p>
+  <p>
+    <label for="html5_multiple_email">Html5 Multiple Email</label>
+    <input type="email" multiple name="form[html5_multiple_email]" value="person@email.com" id="html5_multiple_email"/>
+  </p>
   <p>
     <label for="html5_url">Html5 Url</label>
     <input type="url" name="form[html5_url]" value="http://www.example.com" id="html5_url"/>

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html>
     <head>
         <title>This is the child frame title</title>
@@ -6,4 +7,4 @@
       <iframe src="/frame_one" id="grandchildFrame1"></iframe>
       <iframe src="/frame_two" id="grandchildFrame2"></iframe>
     </body>
-</html>
+</html>

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html>
     <head>
         <title>This is the title of frame one</title>
@@ -5,4 +6,4 @@
     <body>
         <div id="divInFrameOne">This is the text of divInFrameOne</div>
     </body>
-</html>
+</html>

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html>
     <head>
         <title>This is the parent frame title</title>
@@ -5,4 +6,4 @@
     <body>
       <iframe src='/frame_child' id='childFrame'></iframe>
     </body>
-</html>
+</html>