capybara 2.3.0 → 2.4.0

data/lib/capybara/selenium/driver.rb

@@ -91,13 +91,26 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   def reset!
     # Use instance variable directly so we avoid starting the browser just to reset the session
     if @browser
-      begin @browser.manage.delete_all_cookies
-      rescue Selenium::WebDriver::Error::UnhandledError
-        # delete_all_cookies fails when we've previously gone
-        # to about:blank, so we rescue this error and do nothing
-        # instead.
+      begin
+        begin @browser.manage.delete_all_cookies
+        rescue Selenium::WebDriver::Error::UnhandledError
+          # delete_all_cookies fails when we've previously gone
+          # to about:blank, so we rescue this error and do nothing
+          # instead.
+        end
+        @browser.navigate.to("about:blank")
+      rescue Selenium::WebDriver::Error::UnhandledAlertError
+        # This error is thrown if an unhandled alert is on the page
+        # Firefox appears to automatically dismiss this alert, chrome does not
+        # We'll try to accept it
+        begin
+          @browser.switch_to.alert.accept
+        rescue Selenium::WebDriver::Error::NoAlertPresentError
+          # The alert is now gone - nothing to do
+        end
+        # try cleaning up the browser again
+        retry
       end
-      @browser.navigate.to("about:blank")
     end
   end
 
@@ -191,6 +204,23 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.switch_to.window(handle) { yield }
   end
 
+  def accept_modal(type, options={}, &blk)
+    yield if block_given?
+    modal = find_modal(options)
+    modal.send_keys options[:with] if options[:with]
+    message = modal.text
+    modal.accept
+    message
+  end
+
+  def dismiss_modal(type, options={}, &blk)
+    yield if block_given?
+    modal = find_modal(options)
+    message = modal.text
+    modal.dismiss
+    message
+  end
+
   def quit
     @browser.quit if @browser
   rescue Errno::ECONNREFUSED
@@ -220,4 +250,22 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       result
     end
   end
+
+  def find_modal(options={})
+    # Selenium has its own built in wait (2 seconds)for a modal to show up, so this wait is really the minimum time
+    # Actual wait time may be longer than specified
+    wait = Selenium::WebDriver::Wait.new(
+      timeout: (options[:wait] || Capybara.default_wait_time),
+      ignore: Selenium::WebDriver::Error::NoAlertPresentError)
+    begin
+      modal = wait.until do
+        alert = @browser.switch_to.alert
+        regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text].to_s)
+        alert.text.match(regexp) ? alert : nil
+      end
+    rescue Selenium::WebDriver::Error::TimeOutError
+      raise Capybara::ModalNotFound.new("Unable to find modal dialog#{" with #{options[:text]}" if options[:text]}")
+    end
+  end
+
 end

data/lib/capybara/selenium/node.rb

@@ -37,11 +37,13 @@ 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 value.to_s.empty?
+      if self[: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
       else
         #script can change a readonly element which user input cannot, so dont execute if readonly
-        driver.browser.execute_script "arguments[0].value = ''", native unless self[:readonly]
+        driver.browser.execute_script "arguments[0].value = ''", native
         native.send_keys(value.to_s)
       end
     elsif native.attribute('isContentEditable')

data/lib/capybara/session.rb

@@ -35,7 +35,11 @@ module Capybara
       :has_no_table?, :has_table?, :unselect, :has_select?, :has_no_select?,
       :has_selector?, :has_no_selector?, :click_on, :has_no_checked_field?,
       :has_no_unchecked_field?, :query, :assert_selector, :assert_no_selector,
-      :refute_selector
+      :refute_selector, :assert_text, :assert_no_text
+    ]
+    # @api private
+    DOCUMENT_METHODS = [
+      :title, :assert_title, :assert_no_title, :has_title?, :has_no_title?
     ]
     SESSION_METHODS = [
       :body, :html, :source, :current_url, :current_host, :current_path,
@@ -44,9 +48,13 @@ module Capybara
       :windows, :open_new_window, :switch_to_window, :within_window, :window_opened_by,
       :save_page, :save_and_open_page, :save_screenshot,
       :save_and_open_screenshot, :reset_session!, :response_headers,
-      :status_code, :title, :has_title?, :has_no_title?, :current_scope
+      :status_code, :current_scope
+    ] + DOCUMENT_METHODS
+    MODAL_METHODS = [
+      :accept_alert, :accept_confirm, :dismiss_confirm, :accept_prompt,
+      :dismiss_prompt
     ]
-    DSL_METHODS = NODE_METHODS + SESSION_METHODS
+    DSL_METHODS = NODE_METHODS + SESSION_METHODS + MODAL_METHODS
 
     attr_reader :mode, :app, :server
     attr_accessor :synchronized
@@ -78,7 +86,7 @@ module Capybara
     #
     # This method does not:
     #
-    #   * accept modal dialogs if they are present
+    #   * accept modal dialogs if they are present (Selenium driver now does, others may not)
     #   * clear browser cache/HTML 5 local storage/IndexedDB/Web SQL database/etc.
     #   * modify state of the driver/underlying browser in any other way
     #
@@ -167,14 +175,6 @@ module Capybara
       driver.current_url
     end
 
-    ##
-    #
-    # @return [String] Title of the current page
-    #
-    def title
-      driver.title
-    end
-
     ##
     #
     # Navigate to the given URL. The URL can either be a relative URL or an absolute URL
@@ -206,12 +206,15 @@ module Capybara
 
       @touched = true
 
-      if url !~ /^http/ and Capybara.app_host
+      url_relative = URI.parse(url.to_s).scheme.nil?
+
+      if url_relative && Capybara.app_host
         url = Capybara.app_host + url.to_s
+        url_relative = false
       end
 
       if @server
-        url = "http://#{@server.host}:#{@server.port}" + url.to_s unless url =~ /^http/
+        url = "http://#{@server.host}:#{@server.port}" + url.to_s if url_relative
 
         if Capybara.always_include_port
           uri = URI.parse(url)
@@ -523,6 +526,93 @@ module Capybara
       driver.evaluate_script(script)
     end
 
+    ##
+    #
+    # Execute the block, accepting a alert.
+    #
+    # @!macro modal_params
+    #   @overload $0(text, options = {}, &blk)
+    #     @param text [String, Regexp]  Text or regex to match against the text in the modal.  If not provided any modal is matched
+    #   @overload $0(options = {}, &blk)
+    #   @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
+    #   @return [String]  the message shown in the modal
+    #   @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
+    #
+    def accept_alert(text_or_options=nil, options={}, &blk)
+      if text_or_options.is_a? Hash
+        options=text_or_options
+      else
+        options[:text]=text_or_options
+      end
+
+      driver.accept_modal(:alert, options, &blk)
+    end
+
+    ##
+    #
+    # Execute the block, accepting a confirm.
+    #
+    # @macro modal_params
+    #
+    def accept_confirm(text_or_options=nil, options={}, &blk)
+      if text_or_options.is_a? Hash
+        options=text_or_options
+      else
+        options[:text]=text_or_options
+      end
+      
+      driver.accept_modal(:confirm, options, &blk)
+    end
+
+    ##
+    #
+    # Execute the block, dismissing a confirm.
+    #
+    # @macro modal_params
+    #
+    def dismiss_confirm(text_or_options=nil, options={}, &blk)
+      if text_or_options.is_a? Hash
+        options=text_or_options
+      else
+        options[:text]=text_or_options
+      end
+      
+      driver.dismiss_modal(:confirm, options, &blk)
+    end
+
+    ##
+    #
+    # Execute the block, accepting a prompt, optionally responding to the prompt.
+    #
+    # @macro modal_params
+    # @option options [String] :with   Response to provide to the prompt
+    #
+    def accept_prompt(text_or_options=nil, options={}, &blk)
+      if text_or_options.is_a? Hash
+        options=text_or_options
+      else
+        options[:text]=text_or_options
+      end
+      
+      driver.accept_modal(:prompt, options, &blk)
+    end
+
+    ##
+    #
+    # Execute the block, dismissing a prompt.
+    #
+    # @macro modal_params
+    #
+    def dismiss_prompt(text_or_options=nil, options={}, &blk)
+      if text_or_options.is_a? Hash
+        options=text_or_options
+      else
+        options[:text]=text_or_options
+      end
+      
+      driver.dismiss_modal(:prompt, options, &blk)
+    end
+
     ##
     #
     # Save a snapshot of the page.
@@ -586,30 +676,14 @@ module Capybara
       end
     end
 
-    def inspect
-      %(#<Capybara::Session>)
-    end
-
-    def has_title?(content)
-      document.synchronize do
-        unless title.match(Capybara::Helpers.to_regexp(content))
-          raise ExpectationNotMet
-        end
+    DOCUMENT_METHODS.each do |method|
+      define_method method do |*args, &block|
+        document.send(method, *args, &block)
       end
-      return true
-    rescue Capybara::ExpectationNotMet
-      return false
     end
 
-    def has_no_title?(content)
-      document.synchronize do
-        if title.match(Capybara::Helpers.to_regexp(content))
-          raise ExpectationNotMet
-        end
-      end
-      return true
-    rescue Capybara::ExpectationNotMet
-      return false
+    def inspect
+      %(#<Capybara::Session>)
     end
 
     def current_scope

data/lib/capybara/spec/public/test.js

@@ -53,7 +53,7 @@ $(function() {
   $('#reload-list').click(function() {
     setTimeout(function() {
       $('#the-list').html('<li>Foo</li><li>Bar</li>');
-    }, 250)
+    }, 550)
   });
   $('#change-title').click(function() {
     setTimeout(function() {
@@ -67,4 +67,37 @@ $(function() {
     e.preventDefault();
     $(this).after('<a id="has-been-right-clicked" href="#">Has been right clicked</a>');
   });
+  $('#open-alert').click(function() {
+    alert('Alert opened');
+    $(this).attr('opened', 'true');
+  });
+  $('#open-delayed-alert').click(function() {
+    var link = this;
+    setTimeout(function() {
+      alert('Delayed alert opened');
+      $(link).attr('opened', 'true');
+    }, 250);
+  });
+  $('#open-slow-alert').click(function() {
+    var link = this;
+    setTimeout(function() {
+      alert('Delayed alert opened');
+      $(link).attr('opened', 'true');
+    }, 3000);
+  });
+  $('#open-confirm').click(function() {
+    if(confirm('Confirm opened')) {
+      $(this).attr('confirmed', 'true');
+    } else {
+      $(this).attr('confirmed', 'false');
+    }
+  });
+  $('#open-prompt').click(function() {
+    var response = prompt('Prompt opened');
+    if(response === null) {
+      $(this).attr('response', 'dismissed');
+    } else {
+      $(this).attr('response', response);
+    }
+  });
 });

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

@@ -0,0 +1,57 @@
+Capybara::SpecHelper.spec '#accept_alert', :requires => [:modals] do
+  before do
+    @session.visit('/with_js')
+  end
+
+  it "should accept the alert" do
+    @session.accept_alert do
+      @session.click_link('Open alert')
+    end
+    expect(@session).to have_xpath("//a[@id='open-alert' and @opened='true']")
+  end
+  
+  it "should accept the alert if the text matches" do
+    @session.accept_alert 'Alert opened' do
+      @session.click_link('Open alert')
+    end
+    expect(@session).to have_xpath("//a[@id='open-alert' and @opened='true']")
+  end
+  
+  it "should not accept the alert if the text doesnt match" do
+    expect do
+      @session.accept_alert 'Incorrect Text' do
+        @session.click_link('Open alert')
+      end
+    end.to raise_error(Capybara::ModalNotFound)
+  end
+
+  it "should return the message presented" do
+    message = @session.accept_alert do
+      @session.click_link('Open alert')
+    end
+    expect(message).to eq('Alert opened')
+  end
+
+  context "with an asynchronous alert" do
+    it "should accept the alert" do
+      @session.accept_alert do
+        @session.click_link('Open delayed alert')
+      end
+      expect(@session).to have_xpath("//a[@id='open-delayed-alert' and @opened='true']")
+    end
+
+    it "should return the message presented" do
+      message = @session.accept_alert do
+        @session.click_link('Open delayed alert')
+      end
+      expect(message).to eq('Delayed alert opened')
+    end
+    
+    it "should allow to adjust the delay" do
+      @session.accept_alert wait: 4 do
+        @session.click_link('Open slow alert')
+      end
+      expect(@session).to have_xpath("//a[@id='open-slow-alert' and @opened='true']")
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+Capybara::SpecHelper.spec '#accept_confirm', :requires => [:modals] do
+  before do
+    @session.visit('/with_js')
+  end
+
+  it "should accept the confirm" do
+    @session.accept_confirm do
+      @session.click_link('Open confirm')
+    end
+    expect(@session).to have_xpath("//a[@id='open-confirm' and @confirmed='true']")
+  end
+
+  it "should return the message presented" do
+    message = @session.accept_confirm do
+      @session.click_link('Open confirm')
+    end
+    expect(message).to eq('Confirm opened')
+  end
+end

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

@@ -0,0 +1,49 @@
+Capybara::SpecHelper.spec '#accept_prompt', :requires => [:modals] do
+  before do
+    @session.visit('/with_js')
+  end
+
+  it "should accept the prompt with no message" do
+    @session.accept_prompt do
+      @session.click_link('Open prompt')
+    end
+    expect(@session).to have_xpath("//a[@id='open-prompt' and @response='']")
+  end
+
+  it "should return the message presented" do
+    message = @session.accept_prompt do
+      @session.click_link('Open prompt')
+    end
+    expect(message).to eq('Prompt opened')
+  end
+  
+  it "should accept the prompt with a response" do
+    @session.accept_prompt with: 'the response' do
+      @session.click_link('Open prompt')
+    end
+    expect(@session).to have_xpath("//a[@id='open-prompt' and @response='the response']")
+  end
+  
+  it "should accept the prompt if the message matches" do
+    @session.accept_prompt 'Prompt opened', with: 'matched' do
+      @session.click_link('Open prompt')
+    end
+    expect(@session).to have_xpath("//a[@id='open-prompt' and @response='matched']")
+  end
+  
+  it "should not accept the prompt if the message doesn't match" do
+    expect do
+      @session.accept_prompt 'Incorrect Text', with: 'not matched' do
+        @session.click_link('Open prompt')
+      end
+    end.to raise_error(Capybara::ModalNotFound)
+  end
+  
+
+  it "should return the message presented" do
+    message = @session.accept_prompt with: 'the response' do
+      @session.click_link('Open prompt')
+    end
+    expect(message).to eq('Prompt opened')
+  end
+end