capybara 2.12.1 → 2.13.0

data/lib/capybara/queries/selector_query.rb

@@ -57,7 +57,7 @@ module Capybara
             options[:text]
           else
             if exact_text == true
-              "\\A#{Regexp.escape(options[:text].to_s)}\\z"
+              /\A#{Regexp.escape(options[:text].to_s)}\z/
             else
               Regexp.escape(options[:text].to_s)
             end
@@ -68,7 +68,7 @@ module Capybara
         end
 
         if exact_text.is_a?(String)
-          regexp = "\\A#{Regexp.escape(options[:exact_text])}\\z"
+          regexp = /\A#{Regexp.escape(options[:exact_text])}\z/
           text_visible = visible
           text_visible = :all if text_visible == :hidden
           return false if not node.text(text_visible).match(regexp)

data/lib/capybara/rack_test/node.rb

@@ -17,6 +17,12 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
   end
 
   def set(value)
+    return if disabled?
+    if readonly?
+      warn "Attempt to set readonly element with value: #{value} \n * This will raise an exception in a future version of Capybara"
+      return
+    end
+
     if (Array === value) && !multiple?
       raise TypeError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
     end
@@ -28,11 +34,7 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     elsif input_field?
       set_input(value)
     elsif textarea?
-      if self[:readonly]
-        warn "Attempt to set readonly element with value: #{value} \n * This will raise an exception in a future version of Capybara"
-      else
-        native['_capybara_raw_value'] = value.to_s
-      end
+      native['_capybara_raw_value'] = value.to_s
     end
   end
 
@@ -60,6 +62,8 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
         ((tag_name == 'button') and type.nil? or type == "submit")
       associated_form = form
       Capybara::RackTest::Form.new(driver, associated_form).submit(self) if associated_form
+    elsif (tag_name == 'input' and %w(checkbox radio).include?(type))
+      set(!checked?)
     elsif (tag_name == 'label')
       labelled_control = if native[:for]
         find_xpath("//input[@id='#{native[:for]}']").first
@@ -181,7 +185,7 @@ private
       end
       native.remove
     else
-      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"
       else
         native['value'] = value.to_s

data/lib/capybara/selenium/driver.rb

@@ -91,7 +91,8 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def evaluate_script(script, *args)
-    browser.execute_script("return #{script}", *args.map { |arg| arg.is_a?(Capybara::Selenium::Node) ?  arg.native : arg} )
+    result = execute_script("return #{script}", *args)
+    unwrap_script_result(result)
   end
 
   def save_screenshot(path, _options={})
@@ -325,4 +326,17 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   def silenced_unknown_error_messages
     [ /Error communicating with the remote browser/ ]
   end
+
+  def unwrap_script_result(arg)
+    case arg
+    when Array
+      arg.map { |e| unwrap_script_result(e) }
+    when Hash
+      arg.each { |k, v| arg[k] = unwrap_script_result(v) }
+    when Selenium::WebDriver::Element
+      Capybara::Selenium::Node.new(self, arg)
+    else
+      arg
+    end
+  end
 end

data/lib/capybara/selenium/node.rb

@@ -6,7 +6,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def all_text
-    text = driver.browser.execute_script("return arguments[0].textContent", native)
+    text = driver.execute_script("return arguments[0].textContent", self)
     Capybara::Helpers.normalize_whitespace(text)
   end
 
@@ -70,20 +70,29 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
           # Clear field by JavaScript assignment of the value property.
           # Script can change a readonly element which user input cannot, so
           # don't execute if readonly.
-          driver.browser.execute_script "arguments[0].value = ''", native
+          driver.execute_script "arguments[0].value = ''", self
           native.send_keys(value.to_s)
         end
       end
     elsif native.attribute('isContentEditable')
       #ensure we are focused on the element
+      native.click
       script = <<-JS
         var range = document.createRange();
         arguments[0].focus();
         range.selectNodeContents(arguments[0]);
         window.getSelection().addRange(range);
       JS
-      driver.browser.execute_script script, native
-      native.send_keys(value.to_s)
+      driver.execute_script script, self
+      if (driver.options[:browser].to_s == "chrome") ||
+         (driver.options[:browser].to_s == "firefox" && !driver.marionette?)
+        # chromedriver raises a can't focus element if we use native.send_keys
+        # we've already focused it so just use action api
+        driver.browser.action.send_keys(value.to_s).perform
+      else
+        # action api is really slow here just use native.send_keys
+        native.send_keys(value.to_s)
+      end
     end
   end
 

data/lib/capybara/session.rb

@@ -123,17 +123,19 @@ module Capybara
     # Raise errors encountered in the server
     #
     def raise_server_error!
-      if Capybara.raise_server_errors and @server and @server.error
+      if @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"
+          if Capybara.raise_server_errors
+            raise CapybaraError, "Your application server raised an error - It has been raised in your test code because Capybara.raise_server_errors == true"
+          end
         rescue CapybaraError
           #needed to get the cause set correctly in JRuby -- otherwise we could just do raise @server.error
           raise @server.error, @server.error.message, @server.error.backtrace
+        ensure
+          @server.reset_error!
         end
       end
-    ensure
-      @server.reset_error! if @server
     end
 
     ##
@@ -387,21 +389,7 @@ module Capybara
     # @overload within_frame(index)
     #   @param [Integer] index         index of a frame (0 based)
     def within_frame(*args)
-      frame = within(document) do  # Previous 2.x versions ignored current scope when finding frames - consider changing in 3.0
-        case args[0]
-        when Capybara::Node::Element
-          args[0]
-        when String, Hash
-          find(:frame, *args)
-        when Symbol
-          find(*args)
-        when Integer
-          idx = args[0]
-          all(:frame, minimum: idx+1)[idx]
-        else
-          raise TypeError
-        end
-      end
+      frame = _find_frame(*args)
 
       begin
         switch_to_frame(frame)
@@ -612,10 +600,10 @@ module Capybara
     #
     def execute_script(script, *args)
       @touched = true
-      if driver.method(:execute_script).arity == 1
-        raise Capybara::NotSupportedByDriverError, "The current driver does not support arguments being passed with execute_script" unless args.empty?
+      if args.empty?
         driver.execute_script(script)
       else
+        raise Capybara::NotSupportedByDriverError, "The current driver does not support execute_script arguments" if driver.method(:execute_script).arity == 1
         driver.execute_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ?  arg.base : arg} )
       end
     end
@@ -631,12 +619,13 @@ module Capybara
     #
     def evaluate_script(script, *args)
       @touched = true
-      if driver.method(:evaluate_script).arity == 1
-        raise Capybara::NotSupportedByDriverError, "The current driver does not support arguments being passed with execute_script" unless args.empty?
+      result = if args.empty?
         driver.evaluate_script(script)
       else
+        raise Capybara::NotSupportedByDriverError, "The current driver does not support evaluate_script arguments" if driver.method(:evaluate_script).arity == 1
         driver.evaluate_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ?  arg.base : arg} )
       end
+      element_script_result(result)
     end
 
     ##
@@ -842,5 +831,36 @@ module Capybara
     def scopes
       @scopes ||= [nil]
     end
+
+    def element_script_result(arg)
+      case arg
+      when Array
+        arg.map { |e| element_script_result(e) }
+      when Hash
+        arg.each { |k, v| arg[k] = element_script_result(v) }
+      when Capybara::Driver::Node
+        Capybara::Node::Element.new(self, arg, nil, nil)
+      else
+        arg
+      end
+    end
+
+    def _find_frame(*args)
+      within(document) do  # Previous 2.x versions ignored current scope when finding frames - consider changing in 3.0
+        case args[0]
+        when Capybara::Node::Element
+          args[0]
+        when String, Hash
+          find(:frame, *args)
+        when Symbol
+          find(*args)
+        when Integer
+          idx = args[0]
+          all(:frame, minimum: idx+1)[idx]
+        else
+          raise TypeError
+        end
+      end
+    end
   end
 end

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

@@ -19,7 +19,6 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
   end
 
   it "should accept the prompt with a response" do
-    pending "selenium-webdriver/geckodriver doesn't support sending a response to prompts" if marionette?(@session)
     @session.accept_prompt with: 'the response' do
       @session.click_link('Open prompt')
     end
@@ -27,7 +26,6 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
   end
 
   it "should accept the prompt if the message matches" do
-    pending "selenium-webdriver/geckodriver doesn't support sending a response to prompts" if marionette?(@session)
     @session.accept_prompt 'Prompt opened', with: 'matched' do
       @session.click_link('Open prompt')
     end
@@ -44,7 +42,6 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
 
 
   it "should return the message presented" do
-    pending "selenium-webdriver/geckodriver doesn't support sending a response to prompts" if marionette?(@session)
     message = @session.accept_prompt with: 'the response' do
       @session.click_link('Open prompt')
     end

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

@@ -18,4 +18,11 @@ Capybara::SpecHelper.spec "#evaluate_script", requires: [:js] do
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
 
+  it "should support returning elements", requires: [:js, :es_args] do
+    @session.visit('/with_js')
+    el = @session.find(:css, '#change')
+    el = @session.evaluate_script("document.getElementById('change')")
+    expect(el).to be_instance_of(Capybara::Node::Element)
+    expect(el).to eq(@session.find(:css, '#change'))
+  end
 end

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

@@ -135,10 +135,10 @@ Capybara::SpecHelper.spec "node" do
     end
 
     it 'should allow me to change the contents of a contenteditable elements child', requires: [:js] do
-      pending "Selenium doesn't like editing nested contents" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium_/
       @session.visit('/with_js')
       @session.find(:css,'#existing_content_editable_child').set('WYSIWYG')
       expect(@session.find(:css,'#existing_content_editable_child').text).to eq('WYSIWYG')
+      expect(@session.find(:css,'#existing_content_editable_child_parent').text).to eq('Some content WYSIWYG')
     end
   end
 
@@ -313,6 +313,30 @@ Capybara::SpecHelper.spec "node" do
       @session.find(:css, '#link_placeholder').click
       expect(@session.current_url).to match(%r{/with_html$})
     end
+
+    it "should be able to check a checkbox" do
+      @session.visit('form')
+      cbox = @session.find(:checkbox, 'form_terms_of_use')
+      expect(cbox).not_to be_checked
+      cbox.click
+      expect(cbox).to be_checked
+    end
+
+    it "should be able to uncheck a checkbox" do
+      @session.visit('/form')
+      cbox = @session.find(:checkbox, 'form_pets_dog')
+      expect(cbox).to be_checked
+      cbox.click
+      expect(cbox).not_to be_checked
+    end
+
+    it "should be able to select a radio button" do
+      @session.visit('/form')
+      radio = @session.find(:radio_button, 'gender_male')
+      expect(radio).not_to be_checked
+      radio.click
+      expect(radio).to be_checked
+    end
   end
 
   describe '#double_click', requires: [:js] do

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

@@ -30,7 +30,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       window = (@session.windows - [@window]).first
       expect(@session.driver).to receive(:switch_to_window).exactly(5).times.and_call_original
       @session.within_window window do
-        expect(['Title of the first popup', 'Title of popup two']).to include(@session.title)
+        expect(@session).to have_title(/Title of the first popup|Title of popup two/)
       end
       expect(@session.title).to eq('With Windows')
     end
@@ -140,7 +140,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
     it "should find window by handle" do
       window = (@session.windows - [@window]).first
       @session.within_window window.handle do
-        expect(['Title of the first popup', 'Title of popup two']).to include(@session.title)
+        expect(@session).to have_title(/Title of the first popup|Title of popup two/)
       end
     end
 

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

@@ -40,7 +40,8 @@
     <p>
       <div contenteditable='true' id='existing_content_editable'>Editable content</div>
       <div contenteditable='true' id='blank_content_editable' style='height: 1em;'></div>
-      <div contenteditable='true' style='height: 1em;'>
+      <div contenteditable='true' id='existing_content_editable_child_parent' style='height: 1em;'>
+        Some content
         <div id='existing_content_editable_child' style='height: 1em;'>Content</div>
       </div>
     </p>

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.12.1'
+  VERSION = '2.13.0'
 end

data/spec/minitest_spec.rb

@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'capybara/minitest'
+
+class MinitestTest < Minitest::Test
+  include Capybara::DSL
+  include Capybara::Minitest::Assertions
+
+  def setup
+    visit('/form')
+  end
+
+  def teardown
+    Capybara.reset_sessions!
+  end
+
+  def test_assert_text
+    assert_text('Form')
+    assert_no_text('Not on the page')
+    refute_text('Also Not on the page')
+  end
+
+  def test_assert_title
+    visit('/with_title')
+    assert_title('Test Title')
+    assert_no_title('Not the title')
+    refute_title('Not the title')
+  end
+
+  def test_assert_current_path
+    assert_current_path('/form')
+    assert_no_current_path('/not_form')
+    refute_current_path('/not_form')
+  end
+
+  def test_assert_xpath
+    assert_xpath('.//select[@id="form_title"]')
+    assert_xpath('.//select', count: 1) { |el| el[:id] == "form_title" }
+    assert_no_xpath('.//select[@id="not_form_title"]')
+    assert_no_xpath('.//select') { |el| el[:id] == "not_form_title"}
+    refute_xpath('.//select[@id="not_form_title"]')
+  end
+
+  def test_assert_css
+    assert_css('select#form_title')
+    assert_no_css('select#not_form_title')
+  end
+
+  def test_assert_link
+    visit('/with_html')
+    assert_link('A link')
+    assert_link(count: 1){ |el| el.text == 'A link'}
+    assert_no_link('Not on page')
+  end
+
+  def test_assert_button
+    assert_button('fresh_btn')
+    assert_button(count: 1){ |el| el[:id] == 'fresh_btn' }
+    assert_no_button('not_btn')
+  end
+
+  def test_assert_field
+    assert_field('customer_email')
+    assert_no_field('not_on_the_form')
+  end
+
+  def test_assert_select
+    assert_select('form_title')
+    assert_no_select('not_form_title')
+  end
+
+  def test_assert_checked_field
+    assert_checked_field('form_pets_dog')
+    assert_no_checked_field('form_pets_cat')
+    refute_checked_field('form_pets_snake')
+  end
+
+  def test_assert_unchecked_field
+    assert_unchecked_field('form_pets_cat')
+    assert_no_unchecked_field('form_pets_dog')
+    refute_unchecked_field('form_pets_snake')
+  end
+
+  def test_assert_table
+    visit('/tables')
+    assert_table('agent_table')
+    assert_no_table('not_on_form')
+    refute_table('not_on_form')
+  end
+
+  def test_assert_matches_selector
+    assert_matches_selector(find(:field, 'customer_email'), :field, 'customer_email')
+    assert_not_matches_selector(find(:select, 'form_title'), :field, 'customer_email')
+    refute_matches_selector(find(:select, 'form_title'), :field, 'customer_email')
+  end
+
+  def test_assert_matches_css
+    assert_matches_css(find(:select, 'form_title'), 'select#form_title')
+    refute_matches_css(find(:select, 'form_title'), 'select#form_other_title')
+  end
+
+  def test_assert_matches_xpath
+    assert_matches_xpath(find(:select, 'form_title'), './/select[@id="form_title"]')
+    refute_matches_xpath(find(:select, 'form_title'), './/select[@id="form_other_title"]')
+  end
+end
+
+RSpec.describe 'capybara/minitest' do
+  before do
+    Capybara.current_driver = :rack_test
+    Capybara.app = TestApp
+  end
+
+  it "should support minitest" do
+    output = StringIO.new
+    reporter = Minitest::SummaryReporter.new(output)
+    reporter.start
+    MinitestTest.run reporter, {}
+    reporter.report
+    expect(output.string).to include("15 runs, 42 assertions, 0 failures, 0 errors, 0 skips")
+  end
+end