From 505c0cee6b4917d035980bcaf9506e2cbc6f6ebf Mon Sep 17 00:00:00 2001
From: Mike Pack <mikepackdev@gmail.com>
Date: Mon, 1 Apr 2013 16:41:55 -0600
Subject: [PATCH 1/4] Add modal API

---
 README.md                                     | 38 +++++++++++++
 lib/capybara/driver/base.rb                   |  8 +++
 lib/capybara/selenium/driver.rb               | 21 +++++++
 lib/capybara/session.rb                       | 56 ++++++++++++++++++-
 lib/capybara/spec/public/test.js              | 26 +++++++++
 .../spec/session/accept_alert_spec.rb         | 35 ++++++++++++
 .../spec/session/accept_confirm_spec.rb       | 19 +++++++
 .../spec/session/accept_prompt_spec.rb        | 19 +++++++
 .../spec/session/dismiss_confirm_spec.rb      | 19 +++++++
 .../spec/session/dismiss_prompt_spec.rb       | 19 +++++++
 .../spec/session/respond_to_prompt_spec.rb    | 19 +++++++
 lib/capybara/spec/views/with_js.erb           | 16 ++++++
 spec/dsl_spec.rb                              |  1 +
 spec/rack_test_spec.rb                        |  1 +
 14 files changed, 296 insertions(+), 1 deletion(-)
 create mode 100644 lib/capybara/spec/session/accept_alert_spec.rb
 create mode 100644 lib/capybara/spec/session/accept_confirm_spec.rb
 create mode 100644 lib/capybara/spec/session/accept_prompt_spec.rb
 create mode 100644 lib/capybara/spec/session/dismiss_confirm_spec.rb
 create mode 100644 lib/capybara/spec/session/dismiss_prompt_spec.rb
 create mode 100644 lib/capybara/spec/session/respond_to_prompt_spec.rb

diff --git a/README.md b/README.md
index 9c383ef2b..e93836622 100644
--- a/README.md
+++ b/README.md
@@ -482,6 +482,44 @@ that this may break with more complicated expressions:
 result = page.evaluate_script('4 + 4');
 ```
 
+### Modals
+
+In drivers which support it, you can accept, dismiss and respond to alerts, confirms and prompts.
+
+You can accept or dismiss alert messages by wrapping the code that produces an alert in a block:
+
+```ruby
+accept_alert do
+  click_link('Show Alert')
+end
+```
+
+You can accept or dismiss a confirmation by wrapping it in a block, as well:
+
+```ruby
+dismiss_confirm do
+  click_link('Show Confirm')
+end
+```
+
+You can accept or dismiss prompts as well. Additionally, you can respond to a prompt:
+
+```ruby
+respond_to_prompt 'Linus Torvalds' do
+  click_link('Show Prompt About Linux')
+end
+```
+
+All modal methods return the message that was presented. So, you can access the prompt message
+by assigning the return to a variable:
+
+```ruby
+message = respond_to_prompt 'Linus Torvalds' do
+  click_link('Show Prompt About Linux')
+end
+expect(message).to eq('Who is the chief architect of Linux?')
+```
+
 ### Debugging
 
 It can be useful to take a snapshot of the page as it currently is and take a
diff --git a/lib/capybara/driver/base.rb b/lib/capybara/driver/base.rb
index 9fd20d0f0..73a24583c 100644
--- a/lib/capybara/driver/base.rb
+++ b/lib/capybara/driver/base.rb
@@ -55,6 +55,14 @@ def within_window(handle)
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#within_window'
   end
 
+  def accept_modal(type, options={}, &blk)
+    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#accept_modal'
+  end
+
+  def dismiss_modal(type, &blk)
+    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#dismiss_modal'
+  end
+
   def invalid_element_errors
     []
   end
diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb
index 73ae49384..94b9dad2a 100644
--- a/lib/capybara/selenium/driver.rb
+++ b/lib/capybara/selenium/driver.rb
@@ -146,6 +146,21 @@ def within_window(selector, &blk)
     browser.switch_to.window(handle, &blk)
   end
 
+  def accept_modal(type, options={}, &blk)
+    yield
+    modal.send_keys options[:response] if options[:response]
+    message = modal.text
+    modal.accept
+    message
+  end
+
+  def dismiss_modal(type, &blk)
+    yield
+    message = modal.text
+    modal.dismiss
+    message
+  end
+
   def quit
     @browser.quit if @browser
   rescue Errno::ECONNREFUSED
@@ -158,4 +173,10 @@ def invalid_element_errors
     [Selenium::WebDriver::Error::StaleElementReferenceError, Selenium::WebDriver::Error::UnhandledError, Selenium::WebDriver::Error::ElementNotVisibleError]
   end
 
+private
+
+  def modal
+    @browser.switch_to.alert
+  end
+
 end
diff --git a/lib/capybara/session.rb b/lib/capybara/session.rb
index 5daf340fe..4b7bb935c 100644
--- a/lib/capybara/session.rb
+++ b/lib/capybara/session.rb
@@ -45,7 +45,11 @@ class Session
       :save_and_open_screenshot, :reset_session!, :response_headers,
       :status_code, :title, :has_title?, :has_no_title?, :current_scope
     ]
-    DSL_METHODS = NODE_METHODS + SESSION_METHODS
+    MODAL_METHODS = [
+      :accept_alert, :accept_confirm, :dismiss_confirm, :accept_prompt,
+      :dismiss_prompt, :respond_to_prompt
+    ]
+    DSL_METHODS = NODE_METHODS + SESSION_METHODS + MODAL_METHODS
 
     attr_reader :mode, :app, :server
     attr_accessor :synchronized
@@ -367,6 +371,56 @@ def evaluate_script(script)
       driver.evaluate_script(script)
     end
 
+    ##
+    #
+    # Execute the block, accepting a alert.
+    #
+    def accept_alert(&blk)
+      driver.accept_modal(:alert, &blk)
+    end
+
+    ##
+    #
+    # Execute the block, accepting a confirm.
+    #
+    def accept_confirm(&blk)
+      driver.accept_modal(:confirm, &blk)
+    end
+
+    ##
+    #
+    # Execute the block, dismissing a confirm.
+    #
+    def dismiss_confirm(&blk)
+      driver.dismiss_modal(:confirm, &blk)
+    end
+
+    ##
+    #
+    # Execute the block, accepting a prompt.
+    #
+    def accept_prompt(&blk)
+      driver.accept_modal(:prompt, &blk)
+    end
+
+    ##
+    #
+    # Execute the block, dismissing a prompt.
+    #
+    def dismiss_prompt(&blk)
+      driver.dismiss_modal(:prompt, &blk)
+    end
+
+    ##
+    #
+    # Execute the block, responding with the provided value.
+    #
+    # @param [String] response   Response to provide to the prompt
+    #
+    def respond_to_prompt(response, &blk)
+      driver.accept_modal(:prompt, {response: response}, &blk)
+    end
+
     ##
     #
     # Save a snapshot of the page.
diff --git a/lib/capybara/spec/public/test.js b/lib/capybara/spec/public/test.js
index e5db4d30b..3f5df31f7 100644
--- a/lib/capybara/spec/public/test.js
+++ b/lib/capybara/spec/public/test.js
@@ -67,4 +67,30 @@ $(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-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);
+    }
+  });
 });
diff --git a/lib/capybara/spec/session/accept_alert_spec.rb b/lib/capybara/spec/session/accept_alert_spec.rb
new file mode 100644
index 000000000..54a0ec9ed
--- /dev/null
+++ b/lib/capybara/spec/session/accept_alert_spec.rb
@@ -0,0 +1,35 @@
+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 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
+  end
+end
\ No newline at end of file
diff --git a/lib/capybara/spec/session/accept_confirm_spec.rb b/lib/capybara/spec/session/accept_confirm_spec.rb
new file mode 100644
index 000000000..be9cb8c96
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/lib/capybara/spec/session/accept_prompt_spec.rb b/lib/capybara/spec/session/accept_prompt_spec.rb
new file mode 100644
index 000000000..85f1cd4ff
--- /dev/null
+++ b/lib/capybara/spec/session/accept_prompt_spec.rb
@@ -0,0 +1,19 @@
+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
+end
\ No newline at end of file
diff --git a/lib/capybara/spec/session/dismiss_confirm_spec.rb b/lib/capybara/spec/session/dismiss_confirm_spec.rb
new file mode 100644
index 000000000..9c91a50de
--- /dev/null
+++ b/lib/capybara/spec/session/dismiss_confirm_spec.rb
@@ -0,0 +1,19 @@
+Capybara::SpecHelper.spec '#dismiss_confirm', :requires => [:modals] do
+  before do
+    @session.visit('/with_js')
+  end
+
+  it "should dismiss the confirm" do
+    @session.dismiss_confirm do
+      @session.click_link('Open confirm')
+    end
+    expect(@session).to have_xpath("//a[@id='open-confirm' and @confirmed='false']")
+  end
+
+  it "should return the message presented" do
+    message = @session.dismiss_confirm do
+      @session.click_link('Open confirm')
+    end
+    expect(message).to eq('Confirm opened')
+  end
+end
\ No newline at end of file
diff --git a/lib/capybara/spec/session/dismiss_prompt_spec.rb b/lib/capybara/spec/session/dismiss_prompt_spec.rb
new file mode 100644
index 000000000..331adede7
--- /dev/null
+++ b/lib/capybara/spec/session/dismiss_prompt_spec.rb
@@ -0,0 +1,19 @@
+Capybara::SpecHelper.spec '#dismiss_prompt', :requires => [:modals] do
+  before do
+    @session.visit('/with_js')
+  end
+
+  it "should dismiss the prompt" do
+    @session.dismiss_prompt do
+      @session.click_link('Open prompt')
+    end
+    expect(@session).to have_xpath("//a[@id='open-prompt' and @response='dismissed']")
+  end
+
+  it "should return the message presented" do
+    message = @session.dismiss_prompt do
+      @session.click_link('Open prompt')
+    end
+    expect(message).to eq('Prompt opened')
+  end
+end
\ No newline at end of file
diff --git a/lib/capybara/spec/session/respond_to_prompt_spec.rb b/lib/capybara/spec/session/respond_to_prompt_spec.rb
new file mode 100644
index 000000000..b12ea3c4a
--- /dev/null
+++ b/lib/capybara/spec/session/respond_to_prompt_spec.rb
@@ -0,0 +1,19 @@
+Capybara::SpecHelper.spec '#respond_to_prompt', :requires => [:modals] do
+  before do
+    @session.visit('/with_js')
+  end
+
+  it "should accept the prompt" do
+    @session.respond_to_prompt '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 return the message presented" do
+    message = @session.respond_to_prompt 'the response' do
+      @session.click_link('Open prompt')
+    end
+    expect(message).to eq('Prompt opened')
+  end
+end
\ No newline at end of file
diff --git a/lib/capybara/spec/views/with_js.erb b/lib/capybara/spec/views/with_js.erb
index d07a3884a..e97cfbcb9 100644
--- a/lib/capybara/spec/views/with_js.erb
+++ b/lib/capybara/spec/views/with_js.erb
@@ -72,6 +72,22 @@
         
     <p id="click-test">Click me</p>
 
+    <p>
+      <a href="#" id="open-alert">Open alert</a>
+    </p>
+
+    <p>
+      <a href="#" id="open-delayed-alert">Open delayed alert</a>
+    </p>
+
+    <p>
+      <a href="#" id="open-confirm">Open confirm</a>
+    </p>
+
+    <p>
+      <a href="#" id="open-prompt">Open prompt</a>
+    </p>
+
     <script type="text/javascript">
       // a javascript comment
       var aVar = 123;
diff --git a/spec/dsl_spec.rb b/spec/dsl_spec.rb
index ec024ac1b..52b6c5862 100644
--- a/spec/dsl_spec.rb
+++ b/spec/dsl_spec.rb
@@ -7,6 +7,7 @@ class TestClass
 
 Capybara::SpecHelper.run_specs TestClass.new, "DSL", :capybara_skip => [
   :js,
+  :modals,
   :screenshot,
   :frames,
   :windows,
diff --git a/spec/rack_test_spec.rb b/spec/rack_test_spec.rb
index f5b07038b..6170d35e2 100644
--- a/spec/rack_test_spec.rb
+++ b/spec/rack_test_spec.rb
@@ -6,6 +6,7 @@ module TestSessions
 
 Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", :capybara_skip => [
   :js,
+  :modals,
   :screenshot,
   :frames,
   :windows,

From 64b8ca62bdeb3edff4cafbc04ffc12cfaa3b8309 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Tue, 3 Jun 2014 12:18:14 -0700
Subject: [PATCH 2/4] Add adjustable wait time and text matching for modals

---
 lib/capybara.rb                               |  1 +
 lib/capybara/selenium/driver.rb               | 46 ++++++++++++----
 lib/capybara/session.rb                       | 53 ++++++++++++++-----
 lib/capybara/spec/public/test.js              |  7 +++
 .../spec/session/accept_alert_spec.rb         | 23 ++++++++
 lib/capybara/spec/views/with_js.erb           |  1 +
 6 files changed, 110 insertions(+), 21 deletions(-)

diff --git a/lib/capybara.rb b/lib/capybara.rb
index 7622312e3..e9124d119 100644
--- a/lib/capybara.rb
+++ b/lib/capybara.rb
@@ -7,6 +7,7 @@ class CapybaraError < StandardError; end
   class DriverNotFoundError < CapybaraError; end
   class FrozenInTime < CapybaraError; end
   class ElementNotFound < CapybaraError; end
+  class ModalNotFound < CapybaraError; end
   class Ambiguous < ElementNotFound; end
   class ExpectationNotMet < ElementNotFound; end
   class FileNotFound < CapybaraError; end
diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb
index 5562cef0b..500672409 100644
--- a/lib/capybara/selenium/driver.rb
+++ b/lib/capybara/selenium/driver.rb
@@ -91,13 +91,26 @@ def save_screenshot(path, options={})
   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
 
@@ -193,14 +206,16 @@ def within_window(locator)
 
   def accept_modal(type, options={}, &blk)
     yield
+    modal = find_modal(options)
     modal.send_keys options[:response] if options[:response]
     message = modal.text
     modal.accept
     message
   end
 
-  def dismiss_modal(type, &blk)
+  def dismiss_modal(type, options={}, &blk)
     yield
+    modal = find_modal(options)
     message = modal.text
     modal.dismiss
     message
@@ -236,8 +251,21 @@ def within_given_window(handle)
     end
   end
 
-  def modal
-    @browser.switch_to.alert
+  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
diff --git a/lib/capybara/session.rb b/lib/capybara/session.rb
index 13cc0ada1..0fae79d9d 100644
--- a/lib/capybara/session.rb
+++ b/lib/capybara/session.rb
@@ -531,40 +531,65 @@ def evaluate_script(script)
     #
     # Execute the block, accepting a alert.
     #
-    def accept_alert(&blk)
-      driver.accept_modal(:alert, &blk)
+    # @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
+    # @option options [String, Regexp] :text      Text or regex to match against the text in the modal
+    # @return [String]  the message shown in the modal
+    # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
+    #
+    def accept_alert(options={}, &blk)
+      driver.accept_modal(:alert, options, &blk)
     end
 
     ##
     #
     # Execute the block, accepting a confirm.
     #
-    def accept_confirm(&blk)
-      driver.accept_modal(:confirm, &blk)
+    # @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
+    # @option options [String, Regexp] :text      Text or regex to match against the text in the modal
+    # @return [String]  the message shown in the modal
+    # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
+    #
+    def accept_confirm(options={}, &blk)
+      driver.accept_modal(:confirm, options, &blk)
     end
 
     ##
     #
     # Execute the block, dismissing a confirm.
     #
-    def dismiss_confirm(&blk)
-      driver.dismiss_modal(:confirm, &blk)
+    # @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
+    # @option options [String, Regexp] :text      Text or regex to match against the text in the modal
+    # @return [String]  the message shown in the modal
+    # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
+    #
+    def dismiss_confirm(options={}, &blk)
+      driver.dismiss_modal(:confirm, options, &blk)
     end
 
     ##
     #
     # Execute the block, accepting a prompt.
     #
-    def accept_prompt(&blk)
-      driver.accept_modal(:prompt, &blk)
+    # @option options [Numeric] :wait  How long to wait for the prompt to appear after executing the block.
+    # @option options [String, Regexp] :text      Text or regex to match against the text in the prompt
+    # @return [String]  the message shown in the modal
+    # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
+    #
+    def accept_prompt(options={}, &blk)
+      driver.accept_modal(:prompt, options, &blk)
     end
 
     ##
     #
     # Execute the block, dismissing a prompt.
     #
-    def dismiss_prompt(&blk)
-      driver.dismiss_modal(:prompt, &blk)
+    # @option options [Numeric] :wait  How long to wait for the prompt to appear after executing the block.
+    # @option options [String, Regexp] :text      Text or regex to match against the text in the prompt
+    # @return [String]  the message shown in the modal
+    # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
+    #
+    def dismiss_prompt(options={}, &blk)
+      driver.dismiss_modal(:prompt, options, &blk)
     end
 
     ##
@@ -572,9 +597,13 @@ def dismiss_prompt(&blk)
     # Execute the block, responding with the provided value.
     #
     # @param [String] response   Response to provide to the prompt
+    # @option options [Numeric] :wait  How long to wait for the prompt to appear after executing the block.
+    # @option options [String, Regexp] :text      Text or regex to match against the text in the prompt
+    # @return [String]  the message shown in the modal
+    # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
     #
-    def respond_to_prompt(response, &blk)
-      driver.accept_modal(:prompt, {response: response}, &blk)
+    def respond_to_prompt(response, options={}, &blk)
+      driver.accept_modal(:prompt, options.merge(response: response), &blk)
     end
 
     ##
diff --git a/lib/capybara/spec/public/test.js b/lib/capybara/spec/public/test.js
index 3f5df31f7..678f0ce74 100644
--- a/lib/capybara/spec/public/test.js
+++ b/lib/capybara/spec/public/test.js
@@ -78,6 +78,13 @@ $(function() {
       $(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');
diff --git a/lib/capybara/spec/session/accept_alert_spec.rb b/lib/capybara/spec/session/accept_alert_spec.rb
index 54a0ec9ed..86c436738 100644
--- a/lib/capybara/spec/session/accept_alert_spec.rb
+++ b/lib/capybara/spec/session/accept_alert_spec.rb
@@ -9,6 +9,22 @@
     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(text: '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(text: 'Incorrect Text') do
+        @session.click_link('Open alert')
+      end
+    end.to raise_error(Capybara::ModalNotFound)
+    # @session.accept_alert {}  # clear the alert so browser continues to function
+  end
 
   it "should return the message presented" do
     message = @session.accept_alert do
@@ -31,5 +47,12 @@
       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
\ No newline at end of file
diff --git a/lib/capybara/spec/views/with_js.erb b/lib/capybara/spec/views/with_js.erb
index e97cfbcb9..dad73d971 100644
--- a/lib/capybara/spec/views/with_js.erb
+++ b/lib/capybara/spec/views/with_js.erb
@@ -78,6 +78,7 @@
 
     <p>
       <a href="#" id="open-delayed-alert">Open delayed alert</a>
+      <a href="#" id="open-slow-alert">Open slow alert</a>
     </p>
 
     <p>

From acaa67481710a56682d6770761a1383ff1d09d69 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Fri, 27 Jun 2014 12:37:33 -0700
Subject: [PATCH 3/4] remove unnecessary respond_to_prompt, change parameter
 name from :response to :with to match fill_in, take text/regex to match as
 optional inline parameter instead of option

---
 README.md                                     |  6 +-
 lib/capybara/selenium/driver.rb               |  2 +-
 lib/capybara/session.rb                       | 79 +++++++++++++------
 .../spec/session/accept_alert_spec.rb         |  4 +-
 .../spec/session/accept_prompt_spec.rb        | 30 +++++++
 .../spec/session/dismiss_confirm_spec.rb      | 16 ++++
 .../spec/session/dismiss_prompt_spec.rb       |  2 +-
 .../spec/session/respond_to_prompt_spec.rb    | 19 -----
 8 files changed, 106 insertions(+), 52 deletions(-)
 delete mode 100644 lib/capybara/spec/session/respond_to_prompt_spec.rb

diff --git a/README.md b/README.md
index 522e2b1b1..b15e61dbd 100644
--- a/README.md
+++ b/README.md
@@ -517,10 +517,10 @@ dismiss_confirm do
 end
 ```
 
-You can accept or dismiss prompts as well. Additionally, you can respond to a prompt:
+You can accept or dismiss prompts as well, and also provide text to fill in for the response:
 
 ```ruby
-respond_to_prompt 'Linus Torvalds' do
+accept_prompt(with: 'Linus Torvalds') do
   click_link('Show Prompt About Linux')
 end
 ```
@@ -529,7 +529,7 @@ All modal methods return the message that was presented. So, you can access the
 by assigning the return to a variable:
 
 ```ruby
-message = respond_to_prompt 'Linus Torvalds' do
+message = accept_prompt(with: 'Linus Torvalds') do
   click_link('Show Prompt About Linux')
 end
 expect(message).to eq('Who is the chief architect of Linux?')
diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb
index 500672409..274a1cba6 100644
--- a/lib/capybara/selenium/driver.rb
+++ b/lib/capybara/selenium/driver.rb
@@ -207,7 +207,7 @@ def within_window(locator)
   def accept_modal(type, options={}, &blk)
     yield
     modal = find_modal(options)
-    modal.send_keys options[:response] if options[:response]
+    modal.send_keys options[:with] if options[:with]
     message = modal.text
     modal.accept
     message
diff --git a/lib/capybara/session.rb b/lib/capybara/session.rb
index 0fae79d9d..78b3416e4 100644
--- a/lib/capybara/session.rb
+++ b/lib/capybara/session.rb
@@ -48,7 +48,7 @@ class Session
     ]
     MODAL_METHODS = [
       :accept_alert, :accept_confirm, :dismiss_confirm, :accept_prompt,
-      :dismiss_prompt, :respond_to_prompt
+      :dismiss_prompt
     ]
     DSL_METHODS = NODE_METHODS + SESSION_METHODS + MODAL_METHODS
 
@@ -531,12 +531,20 @@ def evaluate_script(script)
     #
     # Execute the block, accepting a alert.
     #
+    # @overload accept_alert(text, options = {}, &blk)
+    #   @param text [String, Regexp]  Text or regex to match against the text in the modal.  If not provided any prompt modal is matched
+    # @overload accept_alert(options = {}, &blk)
     # @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
-    # @option options [String, Regexp] :text      Text or regex to match against the text in the modal
     # @return [String]  the message shown in the modal
     # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
     #
-    def accept_alert(options={}, &blk)
+    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
 
@@ -544,12 +552,20 @@ def accept_alert(options={}, &blk)
     #
     # Execute the block, accepting a confirm.
     #
+    # @overload accept_confirm(text, options = {}, &blk)
+    #   @param text [String, Regexp]  Text or regex to match against the text in the modal.  If not provided any prompt modal is matched
+    # @overload accept_confirm(options = {}, &blk)
     # @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
-    # @option options [String, Regexp] :text      Text or regex to match against the text in the modal
     # @return [String]  the message shown in the modal
     # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
     #
-    def accept_confirm(options={}, &blk)
+    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
 
@@ -557,25 +573,42 @@ def accept_confirm(options={}, &blk)
     #
     # Execute the block, dismissing a confirm.
     #
+    # @overload dismiss_confirm(text, options = {}, &blk)
+    #   @param text [String, Regexp]  Text or regex to match against the text in the modal.  If not provided any prompt modal is matched
+    # @overload dismiss_confirm(options = {}, &blk)
     # @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
-    # @option options [String, Regexp] :text      Text or regex to match against the text in the modal
     # @return [String]  the message shown in the modal
     # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
     #
-    def dismiss_confirm(options={}, &blk)
+    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.
+    # Execute the block, accepting a prompt, optionally responding to the prompt.
     #
+    # @overload accept_prompt(text, options = {}, &blk)
+    #   @param text [String, Regexp]  Text or regex to match against the text in the modal.  If not provided any prompt modal is matched
+    # @overload accept_prompt(options = {}, &blk)
+    # @option options [String] :with   Response to provide to the prompt
     # @option options [Numeric] :wait  How long to wait for the prompt to appear after executing the block.
-    # @option options [String, Regexp] :text      Text or regex to match against the text in the prompt
     # @return [String]  the message shown in the modal
     # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
     #
-    def accept_prompt(options={}, &blk)
+    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
 
@@ -583,29 +616,23 @@ def accept_prompt(options={}, &blk)
     #
     # Execute the block, dismissing a prompt.
     #
+    # @overload dismiss_prompt(text, options = {}, &blk)
+    #   @param text [String, Regexp]  Text or regex to match against the text in the modal.  If not provided any prompt modal is matched
+    # @overload dismiss_prompt(options = {}, &blk)
     # @option options [Numeric] :wait  How long to wait for the prompt to appear after executing the block.
-    # @option options [String, Regexp] :text      Text or regex to match against the text in the prompt
     # @return [String]  the message shown in the modal
     # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
     #
-    def dismiss_prompt(options={}, &blk)
+    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
 
-    ##
-    #
-    # Execute the block, responding with the provided value.
-    #
-    # @param [String] response   Response to provide to the prompt
-    # @option options [Numeric] :wait  How long to wait for the prompt to appear after executing the block.
-    # @option options [String, Regexp] :text      Text or regex to match against the text in the prompt
-    # @return [String]  the message shown in the modal
-    # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
-    #
-    def respond_to_prompt(response, options={}, &blk)
-      driver.accept_modal(:prompt, options.merge(response: response), &blk)
-    end
-
     ##
     #
     # Save a snapshot of the page.
diff --git a/lib/capybara/spec/session/accept_alert_spec.rb b/lib/capybara/spec/session/accept_alert_spec.rb
index 86c436738..8d3451fe2 100644
--- a/lib/capybara/spec/session/accept_alert_spec.rb
+++ b/lib/capybara/spec/session/accept_alert_spec.rb
@@ -11,7 +11,7 @@
   end
   
   it "should accept the alert if the text matches" do
-    @session.accept_alert(text: 'Alert opened') 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']")
@@ -19,7 +19,7 @@
   
   it "should not accept the alert if the text doesnt match" do
     expect do
-      @session.accept_alert(text: 'Incorrect Text') do
+      @session.accept_alert 'Incorrect Text' do
         @session.click_link('Open alert')
       end
     end.to raise_error(Capybara::ModalNotFound)
diff --git a/lib/capybara/spec/session/accept_prompt_spec.rb b/lib/capybara/spec/session/accept_prompt_spec.rb
index 85f1cd4ff..1a3b4c07c 100644
--- a/lib/capybara/spec/session/accept_prompt_spec.rb
+++ b/lib/capybara/spec/session/accept_prompt_spec.rb
@@ -16,4 +16,34 @@
     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
\ No newline at end of file
diff --git a/lib/capybara/spec/session/dismiss_confirm_spec.rb b/lib/capybara/spec/session/dismiss_confirm_spec.rb
index 9c91a50de..9bb65ccfd 100644
--- a/lib/capybara/spec/session/dismiss_confirm_spec.rb
+++ b/lib/capybara/spec/session/dismiss_confirm_spec.rb
@@ -9,6 +9,22 @@
     end
     expect(@session).to have_xpath("//a[@id='open-confirm' and @confirmed='false']")
   end
+  
+  it "should dismiss the confirm if the message matches" do
+    @session.dismiss_confirm 'Confirm opened' do
+      @session.click_link('Open confirm')
+    end
+    expect(@session).to have_xpath("//a[@id='open-confirm' and @confirmed='false']")
+  end
+  
+  it "should not dismiss the confirm if the message doesn't match" do
+    expect do
+      @session.dismiss_confirm 'Incorrect Text' do
+        @session.click_link('Open confirm')
+      end
+    end.to raise_error(Capybara::ModalNotFound)
+  end
+    
 
   it "should return the message presented" do
     message = @session.dismiss_confirm do
diff --git a/lib/capybara/spec/session/dismiss_prompt_spec.rb b/lib/capybara/spec/session/dismiss_prompt_spec.rb
index 331adede7..42ae2f87e 100644
--- a/lib/capybara/spec/session/dismiss_prompt_spec.rb
+++ b/lib/capybara/spec/session/dismiss_prompt_spec.rb
@@ -9,7 +9,7 @@
     end
     expect(@session).to have_xpath("//a[@id='open-prompt' and @response='dismissed']")
   end
-
+  
   it "should return the message presented" do
     message = @session.dismiss_prompt do
       @session.click_link('Open prompt')
diff --git a/lib/capybara/spec/session/respond_to_prompt_spec.rb b/lib/capybara/spec/session/respond_to_prompt_spec.rb
deleted file mode 100644
index b12ea3c4a..000000000
--- a/lib/capybara/spec/session/respond_to_prompt_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-Capybara::SpecHelper.spec '#respond_to_prompt', :requires => [:modals] do
-  before do
-    @session.visit('/with_js')
-  end
-
-  it "should accept the prompt" do
-    @session.respond_to_prompt '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 return the message presented" do
-    message = @session.respond_to_prompt 'the response' do
-      @session.click_link('Open prompt')
-    end
-    expect(message).to eq('Prompt opened')
-  end
-end
\ No newline at end of file

From 973fc4f325ccbc509770774316ee28ba3c3ac999 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Mon, 30 Jun 2014 17:50:41 -0700
Subject: [PATCH 4/4] document expected behavior of Driver#accept_modal and
 #dismiss_modal

---
 lib/capybara/driver/base.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lib/capybara/driver/base.rb b/lib/capybara/driver/base.rb
index b264c69a9..6fc3b4fe1 100644
--- a/lib/capybara/driver/base.rb
+++ b/lib/capybara/driver/base.rb
@@ -91,10 +91,30 @@ def no_such_window_error
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#no_such_window_error'
   end
   
+  
+  ##
+  #
+  # Execute the block, and then accept the modal opened.
+  # @param type [:alert, :confirm, :prompt]
+  # @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
+  # @option options [String, Regexp] :text  Text to verify is in the message shown in the modal
+  # @option options [String] :with  Text to fill in in the case of a prompt
+  # @return [String]  the message shown in the modal
+  # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
+  #
   def accept_modal(type, options={}, &blk)
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#accept_modal'
   end
 
+  ##
+  #
+  # Execute the block, and then dismiss the modal opened.
+  # @param type [:alert, :confirm, :prompt]
+  # @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
+  # @option options [String, Regexp] :text  Text to verify is in the message shown in the modal
+  # @return [String]  the message shown in the modal
+  # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
+  #
   def dismiss_modal(type, &blk)
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#dismiss_modal'
   end