capybara 2.7.1 → 2.8.0

data/lib/capybara/selenium/node.rb

@@ -17,7 +17,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def value
-    if tag_name == "select" and self[:multiple] and not self[:multiple] == "false"
+    if tag_name == "select" and multiple?
       native.find_elements(:xpath, ".//option").select { |n| n.selected? }.map { |n| n[:value] || n.text }
     else
       native[:value]
@@ -38,7 +38,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   def set(value, options={})
     tag_name = self.tag_name
     type = self[:type]
-    if (Array === value) && !self[:multiple]
+    if (Array === value) && !multiple?
       raise ArgumentError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
     end
     if tag_name == 'input' and type == 'radio'
@@ -49,7 +49,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
       path_names = value.to_s.empty? ? [] : value
       native.send_keys(*path_names)
     elsif tag_name == 'textarea' or tag_name == 'input'
-      if self[:readonly]
+      if readonly?
         warn "Attempt to set readonly element with value: #{value} \n *This will raise an exception in a future version of Capybara"
       elsif value.to_s.empty?
         native.clear
@@ -84,7 +84,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def select_option
-    native.click unless selected?
+    native.click unless selected? || disabled?
   end
 
   def unselect_option
@@ -131,12 +131,21 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     selected = native.selected?
     selected and selected != "false"
   end
+  alias :checked? :selected?
 
   def disabled?
     !native.enabled?
   end
 
-  alias :checked? :selected?
+  def readonly?
+    readonly = self[:readonly]
+    readonly and readonly != "false"
+  end
+
+  def multiple?
+    multiple = self[:multiple]
+    multiple and multiple != "false"
+  end
 
   def find_xpath(locator)
     native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
@@ -175,7 +184,6 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
 private
-
   # a reference to the select node if this is an option node
   def select_node
     find_xpath('./ancestor::select').first

data/lib/capybara/server.rb

@@ -61,45 +61,44 @@ module Capybara
 
     def initialize(app, port=Capybara.server_port, host=Capybara.server_host)
       @app = app
-      @middleware = Middleware.new(@app)
       @server_thread = nil # suppress warnings
       @host, @port = host, port
-      @port ||= Capybara::Server.ports[Capybara.reuse_server ? @app.object_id : @middleware.object_id]
+      @port ||= Capybara::Server.ports[port_key]
       @port ||= find_available_port(host)
     end
 
     def reset_error!
-      @middleware.error = nil
+      middleware.error = nil
     end
 
     def error
-      @middleware.error
+      middleware.error
     end
 
     def responsive?
       return false if @server_thread && @server_thread.join(0)
 
-      res = Net::HTTP.start(host, @port) { |http| http.get('/__identify__') }
+      res = Net::HTTP.start(host, port) { |http| http.get('/__identify__') }
 
       if res.is_a?(Net::HTTPSuccess) or res.is_a?(Net::HTTPRedirection)
-        return res.body == @app.object_id.to_s
+        return res.body == app.object_id.to_s
       end
     rescue SystemCallError
       return false
     end
 
     def wait_for_pending_requests
-      Timeout.timeout(60) { sleep(0.01) while @middleware.pending_requests? }
+      Timeout.timeout(60) { sleep(0.01) while pending_requests? }
     rescue Timeout::Error
       raise "Requests did not finish in 60 seconds"
     end
 
     def boot
       unless responsive?
-        Capybara::Server.ports[Capybara.reuse_server ? @app.object_id : @middleware.object_id] = @port
+        Capybara::Server.ports[port_key] = port
 
         @server_thread = Thread.new do
-          Capybara.server.call(@middleware, @port, @host)
+          Capybara.server.call(middleware, port, host)
         end
 
         Timeout.timeout(60) { @server_thread.join(0.1) until responsive? }
@@ -112,12 +111,23 @@ module Capybara
 
   private
 
+    def middleware
+      @middleware ||= Middleware.new(app)
+    end
+
+    def port_key
+      Capybara.reuse_server ? app.object_id : middleware.object_id
+    end
+
+    def pending_requests?
+      middleware.pending_requests?
+    end
+
     def find_available_port(host)
       server = TCPServer.new(host, 0)
       server.addr[1]
     ensure
       server.close if server
     end
-
   end
 end

data/lib/capybara/session.rb

@@ -120,7 +120,14 @@ module Capybara
     # Raise errors encountered in the server
     #
     def raise_server_error!
-      raise @server.error if Capybara.raise_server_errors and @server and @server.error
+      if Capybara.raise_server_errors and @server and @server.error
+        # Force an explanation for the error being raised as the exception cause
+        begin
+          raise CapybaraError, "Your application server raised an error - It has been raised in your test code because Capybara.raise_server_errors == true"
+        rescue CapybaraError
+          raise @server.error
+        end
+      end
     ensure
       @server.reset_error! if @server
     end
@@ -320,18 +327,47 @@ module Capybara
 
     ##
     #
-    # Execute the given block within the given iframe using given frame name or index.
-    # May be supported by not all drivers. Drivers that support it, may provide additional options.
+    # Execute the given block within the given iframe using given frame, frame name/id or index.
+    # May not be supported by all drivers.
     #
+    # @overload within_frame(element)
+    #   @param [Capybara::Node::Element]  frame element
+    # @overload within_frame(name)
+    #   @param [String] name           name/id of a frame
     # @overload within_frame(index)
     #   @param [Integer] index         index of a frame
-    # @overload within_frame(name)
-    #   @param [String] name           name of a frame
     #
-    def within_frame(frame_handle)
+    def within_frame(locator)
       scopes.push(nil)
-      driver.within_frame(frame_handle) do
-        yield
+
+      #support older driver frame api for now
+      frame = case locator
+      when Capybara::Node::Element
+        locator
+      when String
+        find(:frame, locator)
+      when Integer
+        all(:frame, minimum: locator+1)[locator]
+      else
+        raise ArgumentError
+      end
+
+      begin
+        driver.switch_to_frame(frame)
+        begin
+          yield
+        ensure
+          driver.switch_to_frame(:parent)
+        end
+      rescue Capybara::NotSupportedByDriverError
+        # Support older driver frame API for now
+        if driver.respond_to?(:within_frame)
+          driver.within_frame(frame) do
+            yield
+          end
+        else
+          raise
+        end
       end
     ensure
       scopes.pop

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

@@ -7,7 +7,7 @@ Capybara::SpecHelper.spec "#all" do
   it "should find all elements using the given locator" do
     expect(@session.all('//p').size).to eq(3)
     expect(@session.all('//h1').first.text).to eq('This is a test')
-    expect(@session.all("//input[@id='test_field']").first[:value]).to eq('monkey')
+    expect(@session.all("//input[@id='test_field']").first.value).to eq('monkey')
   end
 
   it "should return an empty array when nothing was found" do
@@ -28,7 +28,7 @@ Capybara::SpecHelper.spec "#all" do
   context "with css selectors" do
     it "should find all elements using the given selector" do
       expect(@session.all(:css, 'h1').first.text).to eq('This is a test')
-      expect(@session.all(:css, "input[id='test_field']").first[:value]).to eq('monkey')
+      expect(@session.all(:css, "input[id='test_field']").first.value).to eq('monkey')
     end
 
     it "should find all elements when given a list of selectors" do
@@ -39,7 +39,7 @@ Capybara::SpecHelper.spec "#all" do
   context "with xpath selectors" do
     it "should find the first element using the given locator" do
       expect(@session.all(:xpath, '//h1').first.text).to eq('This is a test')
-      expect(@session.all(:xpath, "//input[@id='test_field']").first[:value]).to eq('monkey')
+      expect(@session.all(:xpath, "//input[@id='test_field']").first.value).to eq('monkey')
     end
   end
 
@@ -47,7 +47,7 @@ Capybara::SpecHelper.spec "#all" do
     before { Capybara.default_selector = :css }
     it "should find the first element using the given locator" do
       expect(@session.all('h1').first.text).to eq('This is a test')
-      expect(@session.all("input[id='test_field']").first[:value]).to eq('monkey')
+      expect(@session.all("input[id='test_field']").first.value).to eq('monkey')
     end
   end
 

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

@@ -37,6 +37,21 @@ Capybara::SpecHelper.spec '#assert_text' do
     expect(@session.assert_text('Some of this text is hidden!')).to eq(true)
   end
 
+  it "should raise error with a helpful message if the requested text is present but invisible" do
+    @session.visit('/with_html')
+    el = @session.find(:css, '#hidden-text')
+    expect do
+      el.assert_text(:visible, 'Some of this text is hidden!')
+    end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time including non-visible text/)
+  end
+
+  it "should raise error with a helpful message if the requested text is present but with incorrect case" do
+    @session.visit('/with_html')
+    expect do
+      @session.assert_text('Text With Whitespace')
+    end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time using a case insensitive search/)
+  end
+
   it "should be true if the text in the page matches given regexp" do
     @session.visit('/with_html')
     expect(@session.assert_text(/Lorem/)).to eq(true)
@@ -166,6 +181,14 @@ Capybara::SpecHelper.spec '#assert_no_text' do
     end.to raise_error(Capybara::ExpectationNotMet, 'expected not to find text "Some of this text is hidden!" in "Some of this text is hidden!"')
   end
 
+  it "should raise error if :all given and text is invisible." do
+    @session.visit('/with_html')
+    el = @session.find(:css, '#some-hidden-text', visible: false)
+    expect do
+      el.assert_no_text(:visible, 'hidden')
+    end.to raise_error(Capybara::ExpectationNotMet, 'expected not to find text "hidden" in "Some of this text is not hidden"')
+  end
+
   it "should be true if the text in the page doesn't match given regexp" do
     @session.visit('/with_html')
     @session.assert_no_text(/xxxxyzzz/)

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

@@ -23,29 +23,29 @@ Capybara::SpecHelper.spec "#check" do
 
   describe "checking" do
     it "should not change an already checked checkbox" do
-      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")['checked']).to be_truthy
+      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")).to be_checked
       @session.check('form_pets_dog')
-      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")['checked']).to be_truthy
+      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")).to be_checked
     end
 
     it "should check an unchecked checkbox" do
-      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")['checked']).to be_falsey
+      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")).not_to be_checked
       @session.check('form_pets_cat')
-      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")['checked']).to be_truthy
+      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")).to be_checked
     end
   end
 
   describe "unchecking" do
     it "should not change an already unchecked checkbox" do
-      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")['checked']).to be_falsey
+      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")).not_to be_checked
       @session.uncheck('form_pets_cat')
-      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")['checked']).to be_falsey
+      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")).not_to be_checked
     end
 
     it "should uncheck a checked checkbox" do
-      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")['checked']).to be_truthy
+      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")).to be_checked
       @session.uncheck('form_pets_dog')
-      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")['checked']).to be_falsey
+      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")).not_to be_checked
     end
   end
 
@@ -111,4 +111,62 @@ Capybara::SpecHelper.spec "#check" do
       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 check via clicking the label with :for attribute if possible" do
+        expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+        @session.check('form_cars_tesla')
+        @session.click_button('awesome')
+        expect(extract_results(@session)['cars']).to include('tesla')
+      end
+
+      it "should check via clicking the wrapping label if possible" do
+        expect(@session.find(:checkbox, 'form_cars_mclaren', unchecked: true, visible: :hidden)).to be
+        @session.check('form_cars_mclaren')
+        @session.click_button('awesome')
+        expect(extract_results(@session)['cars']).to include('mclaren')
+      end
+
+      it "should not click the label if unneeded" do
+        expect(@session.find(:checkbox, 'form_cars_jaguar', checked: true, visible: :hidden)).to be
+        @session.check('form_cars_jaguar')
+        @session.click_button('awesome')
+        expect(extract_results(@session)['cars']).to include('jaguar')
+      end
+
+      it "should raise original error when no label available" do
+        expect { @session.check('form_cars_ariel') }.to raise_error(Capybara::ElementNotFound, 'Unable to find checkbox "form_cars_ariel"')
+      end
+
+      it "should raise error if not allowed to click label" do
+        expect{@session.check('form_cars_mclaren', allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find checkbox "form_cars_mclaren"')
+      end
+    end
+
+    context "with Capybara.automatic_label_click == false" do
+      around do |spec|
+        old_label_click, Capybara.automatic_label_click = Capybara.automatic_label_click, false
+        spec.run
+        Capybara.automatic_label_click = old_label_click
+      end
+
+      it "should raise error if checkbox not visible" do
+        expect{@session.check('form_cars_mclaren')}.to raise_error(Capybara::ElementNotFound, 'Unable to find checkbox "form_cars_mclaren"')
+      end
+
+      it "should check via the label if allow_label_click == true" do
+        expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+        @session.check('form_cars_tesla', allow_label_click: true)
+        @session.click_button('awesome')
+        expect(extract_results(@session)['cars']).to include('tesla')
+      end
+    end
+  end
 end

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

@@ -66,4 +66,24 @@ Capybara::SpecHelper.spec "#choose" do
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  context "with hidden radio buttons" 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 select by clicking the link if available" do
+        @session.choose("party_democrat")
+        @session.click_button('awesome')
+        expect(extract_results(@session)['party']).to eq('democrat')
+      end
+
+      it "should raise error if not allowed to click label" do
+        expect{@session.choose("party_democrat", allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find radio button "party_democrat"')
+      end
+    end
+  end
 end

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

@@ -413,12 +413,9 @@ Capybara::SpecHelper.spec '#click_button' do
     @session.visit('/form')
     @session.fill_in('address1_city', :with =>'Paris')
     @session.fill_in('address1_street', :with =>'CDG')
-    @session.fill_in('address1_street', :with =>'CDG')
-    @session.select("France", :from => 'address1_country')
 
     @session.fill_in('address2_city', :with => 'Mikolaiv')
     @session.fill_in('address2_street', :with => 'PGS')
-    @session.select("Ukraine", :from => 'address2_country')
 
     @session.click_button "awesome"
 

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

@@ -179,4 +179,11 @@ Capybara::SpecHelper.spec '#click_link' do
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  context "without locator" do
+    it "uses options" do
+      @session.click_link(href: '/foo')
+      expect(@session).to have_content('Another World')
+    end
+  end
 end

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

@@ -2,7 +2,12 @@
 Capybara::SpecHelper.spec "#execute_script", :requires => [:js] do
   it "should execute the given script and return nothing" do
     @session.visit('/with_js')
-    expect(@session.execute_script("$('#change').text('Funky Doodle')")).to be_nil
+    expect(@session.execute_script("document.getElementById('change').textContent = 'Funky Doodle'")).to be_nil
     expect(@session).to have_css('#change', :text => 'Funky Doodle')
   end
+
+  it "should be able to call functions defined in the page" do
+    @session.visit('/with_js')
+    expect{ @session.execute_script("$('#change').text('Funky Doodle')") }.not_to raise_error
+  end
 end