rsel 0.0.5 → 0.0.6

data/docs/history.md

@@ -1,11 +1,20 @@
 Rsel History
 ============
 
+0.0.6
+-----
+
+- Added stop_on_error attribute to raise a StopTest exception when a step fails
+- Allow execution of arbitrary Selenium::Client::Driver methods
+- Separated support methods from SeleniumTest methods
+- Fixed field_contains and field_equals so they fail when a field doesn't exist
+
+
 0.0.5
 -----
 
 - Allow Selenium-style locators beginning with id=, name=, xpath=, css= etc.
-- Raise a StopTest exception when Selenium is not running (requires updated rubyslim)
+- Raise a StopTest exception when Selenium is not running
 - Locators are now documented
 - Example FitNesse tables are now included
 

data/docs/install.md

@@ -1,5 +1,5 @@
-Installation & Configuration
-----------------------------
+Installation
+============
 
 To install Rsel from a gem:
 

data/docs/locators.md

@@ -11,11 +11,11 @@ their `name` attribute. Given this HTML:
 
     <a name="contact_us_link" href="/contact">Contact Us</a>
 
-To click on the "Concact Us" link using a standard Selenium locator, you'd have
+To click on the "Contact Us" link using a standard Selenium locator, you'd have
 to do one of the following:
 
-    | click | contact_us_link |
-    | click | link=Contact Us |
+    | Click | contact_us_link |
+    | Click | link=Contact Us |
 
 This is easy enough, but what if the target element does not have a `name`
 attribute defined? What if the link is an image instead of a piece of text? In
@@ -47,7 +47,7 @@ the `alt` text in the case of an image link. Form fields are matched on their
 plain-text label, `name` or `id` attribute. In Rsel, the above examples become
 much easier:
 
-    | click | Contact Us |
+    | Click | Contact Us |
     | Type | Eric | into field | First name |
 
 This allows you to use human-readable locator strings for most HTML elements,
@@ -62,11 +62,12 @@ sense to write:
 
     | Type | Eric | into field | link=Contact Us |
 
-But Rsel won't stop you from trying! One drawback to this approach is that any
-[scoping](scoping.md) clause is ignored. In most cases, it's easier, safer, and
-more readable to use the plain text locator, and rely on Rsel's internal logic
-to find the correct element. This feature is only provided as a workaround for
-the possibility that Rsel's locator scheme is too restrictive for your needs.
+But Rsel won't stop you from trying! One drawback to using explicit Selenium
+locators is that any [scoping](scoping.md) clause is ignored. In most cases,
+it's easier, safer, and more readable to use the plain text locator, and rely
+on Rsel's internal logic to find the correct element. This feature is only
+provided as a workaround for the possibility that Rsel's locator scheme is too
+restrictive for your needs.
 
 Next: [Scoping](scoping.md)
 

data/docs/scoping.md

@@ -1,7 +1,7 @@
 Scoping
 =======
 
-Several of the actions and verifications accept an optional hash of scoping
+Most of Rsel's actions and verifications accept an optional hash of scoping
 keywords, allowing you to be specific about what area of the page to operate
 on. This page describes how to use them.
 
@@ -96,7 +96,13 @@ contain URLs, email addresses, or other auto-interpreted text:
 Another important thing to note is that due to the way FitNesse Slim script
 tables are evaluated, the scoping hash must be added after a cell that contains
 part of the method name. Cells in these tables must contain alternating
-(function, argument) chunks; the way the above example breaks down is:
+(function, argument) chunks. To illustrate, consider the phone number example:
+
+    | Type | 111-222-3333 | into | Phone number | field | !{within:work} |
+
+The cells in this row alternate between function and argument, with the first
+cell being the beginning of the function name, and every alternating cell after
+that being a continuation of the function name. Picture it like this:
 
     | Type |              | into |              | field |                |
     |      | 111-222-3333 |      | Phone number |       | !{within:work} |
@@ -107,8 +113,8 @@ call row that does not end with a function-name component, you need to include
 a semicolon after the last function-name component, so all remaining cells will
 be treated as arguments. These are valid alternative ways of calling the same function:
 
-    | Type | 111-222-3333 | into field; | Phone number | !{within:work |
-    | Type into field; | 111-222-3333 | Phone number | !{within:work |
+    | Type | 111-222-3333 | into field; | Phone number | !{within:work} |
+    | Type into field; | 111-222-3333 | Phone number | !{within:work} |
 
 The `SeleniumTest` method names were, for the most part, crafted so that the
 alternating (function, argument) form reads the most naturally.

data/docs/usage.md

@@ -3,8 +3,8 @@ Usage
 
 Once you have created your `SetUp` page, you can create sibling pages with
 tests in them. For instance, continuing with the example from
-[Installation & Configuration](install.md), your `SeleniumTests.LoginTest`
-might look like this:
+[Installation](install.md), your `SeleniumTests.LoginTest` might look like
+this:
 
     !| script | selenium test | http://www.mysite.com |
     | Open browser                                    |

data/lib/rsel/exceptions.rb

@@ -1,4 +1,6 @@
 module Rsel
   class LocatorNotFound < RuntimeError; end
-  class StopTestSeleniumNotRunning < RuntimeError; end
+  class StopTestCannotConnect < RuntimeError; end
+  class StopTestSessionNotStarted < RuntimeError; end
+  class StopTestStepFailed < RuntimeError; end
 end

data/lib/rsel/selenium_test.rb

@@ -46,9 +46,11 @@ module Rsel
         :port => port,
         :browser => browser,
         :url => url)
+      @stop_on_error = false
     end
 
-    attr_reader :url, :browser
+    attr_reader :url, :browser, :stop_on_error
+    attr_writer :stop_on_error
 
 
     # Start the session and open a browser to the URL defined at the start of
@@ -57,13 +59,14 @@ module Rsel
     # @example
     #   | Open browser |
     #
-    # @raise [StopTestSeleniumNotRunning] if Selenium connection cannot be made
+    # @raise [StopTestCannotConnect] if Selenium connection cannot be made
     #
     def open_browser
       begin
         @browser.start_new_browser_session
       rescue
-        raise StopTestSeleniumNotRunning, "Could not start Selenium."
+        raise StopTestCannotConnect,
+          "Cannot connect to Selenium server at #{@browser.host}:#{@browser.port}"
       else
         visit @url
       end
@@ -144,7 +147,7 @@ module Rsel
     #   | See | Welcome, Marcus |
     #
     def see(text)
-      return @browser.text?(text)
+      pass_if @browser.text?(text)
     end
 
 
@@ -157,7 +160,7 @@ module Rsel
     #   | Do not see | Take a hike |
     #
     def do_not_see(text)
-      return !@browser.text?(text)
+      pass_if !@browser.text?(text)
     end
 
 
@@ -170,7 +173,7 @@ module Rsel
     #   | See title | Our Homepage |
     #
     def see_title(title)
-      return (@browser.get_title == title)
+      pass_if @browser.get_title == title
     end
 
 
@@ -183,7 +186,7 @@ module Rsel
     #   | Do not see title | Someone else's homepage |
     #
     def do_not_see_title(title)
-      return !(@browser.get_title == title)
+      pass_if !(@browser.get_title == title)
     end
 
 
@@ -201,7 +204,7 @@ module Rsel
     # @since 0.0.2
     #
     def link_exists(locator, scope={})
-      return @browser.element?(loc(locator, 'link', scope))
+      pass_if @browser.element?(loc(locator, 'link', scope))
     end
 
 
@@ -219,7 +222,7 @@ module Rsel
     # @since 0.0.2
     #
     def button_exists(locator, scope={})
-      return @browser.element?(loc(locator, 'button', scope))
+      pass_if @browser.element?(loc(locator, 'button', scope))
     end
 
 
@@ -236,7 +239,7 @@ module Rsel
     #
     def row_exists(cells)
       row = XPath.descendant(:tr)[XPath::HTML.table_row(cells.split(/, */))]
-      return @browser.element?("xpath=#{row.to_s}")
+      pass_if @browser.element?("xpath=#{row.to_s}")
     end
 
 
@@ -290,7 +293,13 @@ module Rsel
     #   | Field | First name | contains | Eric |
     #
     def field_contains(locator, text, scope={})
-      @browser.field(loc(locator, 'field', scope)).include?(text)
+      begin
+        field = @browser.field(loc(locator, 'field', scope))
+      rescue => e
+        failure e.message
+      else
+        pass_if field.include?(text)
+      end
     end
 
 
@@ -307,7 +316,13 @@ module Rsel
     #   | Field | First name | equals; | Eric | !{within:contact} |
     #
     def field_equals(locator, text, scope={})
-      @browser.field(loc(locator, 'field', scope)) == text
+      begin
+        field = @browser.field(loc(locator, 'field', scope))
+      rescue => e
+        failure e.message
+      else
+        pass_if field == text
+      end
     end
 
 
@@ -425,8 +440,8 @@ module Rsel
       xp = loc(locator, 'checkbox', scope)
       begin
         enabled = @browser.checked?(xp)
-      rescue
-        return false
+      rescue => e
+        failure e.message
       else
         return enabled
       end
@@ -450,8 +465,8 @@ module Rsel
       xp = loc(locator, 'radio_button', scope)
       begin
         enabled = @browser.checked?(xp)
-      rescue
-        return false
+      rescue => e
+        failure e.message
       else
         return enabled
       end
@@ -473,8 +488,8 @@ module Rsel
       xp = loc(locator, 'checkbox', scope)
       begin
         enabled = @browser.checked?(xp)
-      rescue
-        return false
+      rescue => e
+        failure e.message
       else
         return !enabled
       end
@@ -498,8 +513,8 @@ module Rsel
       xp = loc(locator, 'radio_button', scope)
       begin
         enabled = @browser.checked?(xp)
-      rescue
-        return false
+      rescue => e
+        failure e.message
       else
         return !enabled
       end
@@ -559,7 +574,7 @@ module Rsel
       dropdown = XPath::HTML.select(locator)
       opt = dropdown[XPath::HTML.option(option)]
       opt_str = opt.to_s
-      return @browser.element?("xpath=#{opt_str}")
+      pass_if @browser.element?("xpath=#{opt_str}")
     end
 
 
@@ -578,8 +593,8 @@ module Rsel
     def dropdown_equals(locator, option, scope={})
       begin
         selected = @browser.get_selected_label(loc(locator, 'select', scope))
-      rescue
-        return false
+      rescue => e
+        failure e.message
       else
         return selected == option
       end
@@ -616,6 +631,94 @@ module Rsel
       end
     end
 
+
+    # Execute the given block, and return false if it raises an exception.
+    # Otherwise, return true. If `@stop_on_error` is true, raise a
+    # `StopTestStepFailed` exception instead of returning false.
+    #
+    # @example
+    #   return_error_status do
+    #     # some code that might raise an exception
+    #   end
+    #
+    def return_error_status
+      begin
+        yield
+      rescue => e
+        #puts e.message
+        #puts e.backtrace
+        failure e.message
+      else
+        return true
+      end
+    end
+
+
+    # Invoke a missing method. If a method is called on a SeleniumTest
+    # instance, and that method is not explicitly defined, this method
+    # will check to see whether the underlying Selenium::Client::Driver
+    # instance can respond to that method. If so, that method is called
+    # instead.
+    #
+    # @since 0.0.6
+    #
+    def method_missing(method, *args, &block)
+      if @browser.respond_to?(method)
+        @browser.send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+
+    # Return true if SeleniumTest explicitly responds to a given method
+    # name, or if the underlying Selenium::Client::Driver instance can
+    # respond to it. This is a counterpart to {#method_missing}, used
+    # for checking whether a given method can be called on this instance.
+    #
+    # @since 0.0.6
+    #
+    def respond_to?(method, include_private=false)
+      if @browser.respond_to?(method)
+        true
+      else
+        super
+      end
+    end
+
+
+    # Indicate a failure by returning `false` or raising an exception.
+    # If `@stop_on_error` is true, raise a `StopTestStepFailed` exception.
+    # Otherwise, simply return false.
+    #
+    # @param [String] message
+    #   Optional message to include in the exception.
+    #   Ignored if `@stop_on_error` is false.
+    #
+    # @since 0.0.6
+    #
+    def failure(message='')
+      if @stop_on_error
+        raise StopTestStepFailed, message
+      else
+        return false
+      end
+    end
+
+
+    # Pass if the given condition is true; otherwise, fail by calling
+    # {#failure} with an optional `message`.
+    #
+    # @since 0.0.6
+    #
+    def pass_if(condition, message='')
+      if condition
+        return true
+      else
+        failure message
+      end
+    end
+
   end
 end
 

data/lib/rsel/support.rb

@@ -6,26 +6,6 @@ module Rsel
   # Support functions for Rsel
   module Support
 
-    # Execute the given block, and return false if it raises an exception.
-    # Otherwise, return true.
-    #
-    # @example
-    #   return_error_status do
-    #     # some code that might raise an exception
-    #   end
-    #
-    def return_error_status
-      begin
-        yield
-      rescue => e
-        #puts e.message
-        #puts e.backtrace
-        return false
-      else
-        return true
-      end
-    end
-
     # Convert the given locator to a format accepted by Selenium. If `locator`
     # starts with `id=`, `name=`, `dom=`, `xpath=` `link=` or `css=`, then the
     # locator is returned unchanged. Otherwise, `locator` is assumed to be a

data/rsel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rsel"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.summary = "Runs Selenium tests from FitNesse"
   s.description = <<-EOS
     Rsel provides a Slim fixture for running Selenium tests, with

data/spec/selenium_test_spec.rb

@@ -23,796 +23,818 @@ describe Rsel::SeleniumTest do
   end
 
 
-  context "checkboxes" do
+  context "navigation" do
     before(:each) do
-      @st.visit("/form").should be_true
+      @st.visit("/").should be_true
     end
 
-    describe "#enable_checkbox" do
+    describe "#visit" do
       context "passes when" do
-        context "checkbox with label" do
-          it "exists" do
-            @st.enable_checkbox("I like cheese").should be_true
-            @st.enable_checkbox("I like salami").should be_true
-          end
-
-          it "exists within scope" do
-            @st.enable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
-            @st.enable_checkbox("I like salami", :within => "salami_checkbox").should be_true
-          end
-
-          it "exists in table row" do
-            @st.visit("/table")
-            @st.enable_checkbox("Like", :in_row => "Marcus").should be_true
-          end
-        end
-
-        context "checkbox with id=" do
-          it "exists" do
-            @st.enable_checkbox("id=like_cheese").should be_true
-          end
-        end
-
-        context "checkbox with xpath=" do
-          it "exists" do
-            @st.enable_checkbox("xpath=//input[@id='like_cheese']").should be_true
-          end
+        it "page exists" do
+          @st.visit("/about").should be_true
         end
       end
 
       context "fails when" do
-        context "checkbox with label" do
-          it "does not exist" do
-            @st.enable_checkbox("I dislike bacon").should be_false
-            @st.enable_checkbox("I like broccoli").should be_false
-          end
-
-          it "exists, but not within scope" do
-            @st.enable_checkbox("I like cheese", :within => "salami_checkbox").should be_false
-            @st.enable_checkbox("I like salami", :within => "cheese_checkbox").should be_false
-          end
-
-          it "exists, but not in table row" do
-            @st.visit("/table")
-            @st.enable_checkbox("Like", :in_row => "Eric").should be_false
-          end
+        it "page does not exist" do
+          @st.visit("/bad/path").should be_false
         end
       end
     end
 
-    describe "#disable_checkbox" do
-      context "passes when" do
-        context "checkbox with label" do
-          it "exists" do
-            @st.disable_checkbox("I like cheese").should be_true
-            @st.disable_checkbox("I like salami").should be_true
-          end
-
-          it "exists within scope" do
-            @st.disable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
-            @st.disable_checkbox("I like salami", :within => "preferences_form").should be_true
-          end
-
-          it "exists in table row" do
-            @st.visit("/table")
-            @st.disable_checkbox("Like", :in_row => "Marcus").should be_true
-          end
-        end
-
-        context "checkbox with id=" do
-          it "exists" do
-            @st.disable_checkbox("id=like_cheese").should be_true
-          end
-        end
+    context "reload the current page" do
+      # TODO
+    end
 
-        context "checkbox with xpath=" do
-          it "exists" do
-            @st.disable_checkbox("xpath=//input[@id='like_cheese']").should be_true
-          end
-        end
+    describe "#click_back" do
+      it "passes and loads the correct URL" do
+        @st.visit("/about")
+        @st.visit("/")
+        @st.click_back.should be_true
+        @st.see_title("About this site").should be_true
       end
 
-      context "fails when" do
-        context "checkbox with label" do
-          it "does not exist" do
-            @st.disable_checkbox("I dislike bacon").should be_false
-            @st.disable_checkbox("I like broccoli").should be_false
-          end
+      #it "fails when there is no previous page in the history" do
+        # TODO: No obvious way to test this, since everything is running in the
+        # same session
+      #end
+    end
+  end # navigation
 
-          it "exists, but not within scope" do
-            @st.disable_checkbox("I like cheese", :within => "salami_checkbox").should be_false
-            @st.disable_checkbox("I like salami", :within => "cheese_checkbox").should be_false
-          end
 
-          it "exists, but not in table row" do
-            @st.visit("/table")
-            @st.disable_checkbox("Like", :in_row => "Eric").should be_false
-          end
-        end
-      end
+  context "visibility" do
+    before(:each) do
+      @st.visit("/").should be_true
     end
 
-    describe "#checkbox_is_enabled" do
+    describe "#see" do
       context "passes when" do
-        context "checkbox with label" do
-          it "exists and is checked" do
-            @st.enable_checkbox("I like cheese").should be_true
-            @st.checkbox_is_enabled("I like cheese").should be_true
-          end
-
-          it "exists within scope and is checked" do
-            @st.enable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
-            @st.checkbox_is_enabled("I like cheese", :within => "cheese_checkbox").should be_true
-          end
-
-          it "exists in table row and is checked" do
-            @st.visit("/table")
-            @st.enable_checkbox("Like", :in_row => "Ken").should be_true
-            @st.checkbox_is_enabled("Like", :in_row => "Ken").should be_true
-          end
+        it "text is present" do
+          @st.see("Welcome").should be_true
+          @st.see("This is a Sinatra webapp").should be_true
         end
       end
 
       context "fails when" do
-        context "checkbox with label" do
-          it "does not exist" do
-            @st.checkbox_is_enabled("I dislike bacon").should be_false
-          end
-
-          it "exists but is unchecked" do
-            @st.disable_checkbox("I like cheese").should be_true
-            @st.checkbox_is_enabled("I like cheese").should be_false
-          end
-
-          it "exists and is checked, but not within scope" do
-            @st.enable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
-            @st.checkbox_is_enabled("I like cheese", :within => "salami_checkbox").should be_false
-          end
-
-          it "exists and is checked, but not in table row" do
-            @st.visit("/table")
-            @st.enable_checkbox("Like", :in_row => "Marcus").should be_true
-            @st.checkbox_is_enabled("Like", :in_row => "Eric").should be_false
-          end
+        it "text is absent" do
+          @st.see("Nonexistent").should be_false
+          @st.see("Some bogus text").should be_false
         end
       end
+
+      it "is case-sensitive" do
+        @st.see("Sinatra webapp").should be_true
+        @st.see("sinatra Webapp").should be_false
+      end
     end
 
-    describe "#checkbox_is_disabled" do
+    describe "#do_not_see" do
       context "passes when" do
-        context "checkbox with label" do
-          it "exists and is unchecked" do
-            @st.disable_checkbox("I like cheese").should be_true
-            @st.checkbox_is_disabled("I like cheese").should be_true
-          end
-
-          it "exists within scope and is unchecked" do
-            @st.disable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
-            @st.checkbox_is_disabled("I like cheese", :within => "cheese_checkbox").should be_true
-          end
-
-          it "exists in table row and is unchecked" do
-            @st.visit("/table")
-            @st.disable_checkbox("Like", :in_row => "Ken").should be_true
-            @st.checkbox_is_disabled("Like", :in_row => "Ken").should be_true
-          end
+        it "text is absent" do
+          @st.do_not_see("Nonexistent").should be_true
+          @st.do_not_see("Some bogus text").should be_true
         end
       end
 
       context "fails when" do
-        context "checkbox with label" do
-          it "does not exist" do
-            @st.checkbox_is_disabled("I dislike bacon").should be_false
-          end
-
-          it "exists but is checked" do
-            @st.enable_checkbox("I like cheese").should be_true
-            @st.checkbox_is_disabled("I like cheese").should be_false
-          end
-
-          it "exists and is unchecked, but not within scope" do
-            @st.disable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
-            @st.checkbox_is_disabled("I like cheese", :within => "salami_checkbox").should be_false
-          end
-
-          it "exists and is unchecked, but not in table row" do
-            @st.visit("/table")
-            @st.disable_checkbox("Like", :in_row => "Marcus").should be_true
-            @st.checkbox_is_disabled("Like", :in_row => "Eric").should be_false
-          end
+        it "fails when test is present" do
+          @st.do_not_see("Welcome").should be_false
+          @st.do_not_see("This is a Sinatra webapp").should be_false
         end
       end
+
+      it "is case-sensitive" do
+        @st.do_not_see("Sinatra webapp").should be_false
+        @st.do_not_see("sinatra Webapp").should be_true
+      end
     end
-  end
+  end # visibility
 
 
-  context "radiobuttons" do
+  context "links" do
     before(:each) do
-      @st.visit("/form").should be_true
+      @st.visit("/").should be_true
     end
 
-    context "#select_radio" do
+    describe "#click" do
       context "passes when" do
-        context "radiobutton with label" do
-          it "exists" do
-            @st.select_radio("Briefs").should be_true
-          end
-
-          it "exists within scope" do
-            @st.select_radio("Briefs", :within => "clothing").should be_true
-          end
-
-          it "exists in table row" do
-            # TODO
-          end
+        it "link exists" do
+          @st.click("About this site").should be_true
         end
       end
 
       context "fails when" do
-        context "radiobutton with label" do
-          it "does not exist" do
-            @st.select_radio("Naked").should be_false
-          end
-
-          it "exists, but not within scope" do
-            @st.select_radio("Briefs", :within => "food").should be_false
-          end
-
-          it "exists, but not in table row" do
-            # TODO
-          end
+        it "link does not exist" do
+          @st.click("Bogus link").should be_false
         end
       end
     end
 
-    context "#radio_is_enabled" do
+    describe "#click_link" do
       context "passes when" do
-        context "radiobutton with label" do
-          it "exists, and is enabled" do
-            @st.select_radio("Briefs")
-            @st.radio_is_enabled("Briefs").should be_true
-          end
+        it "link exists" do
+          @st.click_link("About this site").should be_true
+        end
 
-          it "exists within scope, and is enabled" do
-            @st.select_radio("Briefs", :within => "clothing")
-            @st.radio_is_enabled("Briefs", :within => "clothing").should be_true
-          end
+        it "link exists within scope" do
+          @st.click_link("About this site", :within => "header").should be_true
+        end
 
-          it "exists in table row, and is enabled" do
-            # TODO
-          end
+        it "link exists in table row" do
+          @st.visit("/table")
+          @st.click_link("Edit", :in_row => "Marcus").should be_true
+          @st.see_title("Editing Marcus").should be_true
         end
       end
 
       context "fails when" do
-        context "radiobutton with label" do
-          it "does not exist" do
-            @st.radio_is_enabled("Naked").should be_false
-          end
+        it "link does not exist" do
+          @st.click_link("Bogus link").should be_false
+        end
 
-          it "exists, but is not enabled" do
-            @st.select_radio("Briefs")
-            @st.radio_is_enabled("Boxers").should be_false
-          end
+        it "link exists, but not within scope" do
+          @st.click_link("About this site", :within => "footer").should be_false
+        end
 
-          it "exists and is enabled, but not within scope" do
-            @st.select_radio("Briefs", :within => "clothing")
-            @st.radio_is_enabled("Briefs", :within => "food").should be_false
-          end
+        it "link exists, but not in table row" do
+          @st.visit("/table")
+          @st.click_link("Edit", :in_row => "Ken").should be_false
         end
       end
     end
-  end
-
-
-  context "dropdowns" do
-    before(:each) do
-      @st.visit("/form").should be_true
-    end
 
-    context "#select_from_dropdown" do
+    describe "#link_exists" do
       context "passes when" do
-        it "option exists in the dropdown" do
-          @st.select_from_dropdown("Tall", "Height").should be_true
-          @st.select_from_dropdown("Medium", "Weight").should be_true
-        end
-
-        it "option exists in the dropdown within scope" do
-          @st.select_from_dropdown("Tall", "Height", :within => "spouse_form").should be_true
+        it "link with the given text exists" do
+          @st.link_exists("About this site").should be_true
+          @st.link_exists("Form test").should be_true
         end
 
-        it "option exists in the dropdown in table row" do
-          @st.visit("/table")
-          @st.select_from_dropdown("Male", "Gender", :in_row => "Eric").should be_true
+        it "link with the given text exists within scope" do
+          @st.link_exists("About this site", :within => "header").should be_true
+          @st.link_exists("Form test", :within => "footer").should be_true
+          @st.link_exists("Table test", :within => "footer").should be_true
         end
       end
 
       context "fails when" do
-        it "no such dropdown exists" do
-          @st.select_from_dropdown("Over easy", "Eggs").should be_false
+        it "no such link exists" do
+          @st.link_exists("Welcome").should be_false
+          @st.link_exists("Don't click here").should be_false
         end
 
-        it "dropdown exists, but the option doesn't" do
-          @st.select_from_dropdown("Giant", "Height").should be_false
-          @st.select_from_dropdown("Obese", "Weight").should be_false
+        it "link exists, but not within scope" do
+          @st.link_exists("About this site", :within => "footer").should be_false
+          @st.link_exists("Form test", :within => "header").should be_false
+          @st.link_exists("Table test", :within => "header").should be_false
         end
+      end
+    end
+  end # links
 
-        it "dropdown exists, but not within scope" do
-          @st.select_from_dropdown("Medium", "Weight", :within => "spouse_form").should be_false
+
+  context "buttons" do
+    before(:each) do
+      @st.visit("/form").should be_true
+    end
+
+    describe "#click_button" do
+      context "passes when" do
+        it "button exists and is enabled" do
+          @st.click_button("Submit person form").should be_true
         end
 
-        it "dropdown exists, but not in table row" do
-          @st.visit("/table")
-          @st.select_from_dropdown("Female", "Gender", :in_row => "First name").should be_false
+        it "button exists within scope" do
+          @st.click_button("Submit person form", :within => "person_form").should be_true
         end
-      end
-    end
 
-    context "#dropdown_includes" do
-      context "passes when" do
-        it "option exists in the dropdown" do
-          @st.dropdown_includes("Height", "Tall").should be_true
-          @st.dropdown_includes("Weight", "Medium").should be_true
+        it "button exists in table row" do
+          # TODO
         end
       end
 
       context "fails when" do
-        it "dropdown exists, but the option doesn't" do
-          @st.dropdown_includes("Height", "Giant").should be_false
-          @st.dropdown_includes("Weight", "Obese").should be_false
+        it "button does not exist" do
+          @st.click_button("No such button").should be_false
         end
 
-        it "no such dropdown exists" do
-          @st.dropdown_includes("Eggs", "Over easy").should be_false
+        it "button exists, but not within scope" do
+          @st.click_button("Submit person form", :within => "spouse_form").should be_false
+        end
+
+        it "button exists, but not in table row" do
+          # TODO
+        end
+
+        it "button exists, but is disabled" do
+          # TODO
         end
       end
     end
 
-    context "#dropdown_equals" do
+
+    describe "#button_exists" do
       context "passes when" do
-        it "option is selected in the dropdown" do
-          ["Short", "Average", "Tall"].each do |height|
-            @st.select_from_dropdown(height, "Height")
-            @st.dropdown_equals("Height", height).should be_true
+        context "button with text" do
+          it "exists" do
+            @st.button_exists("Submit person form").should be_true
+            @st.button_exists("Save preferences").should be_true
           end
-        end
 
-        it "option is selected in the dropdown, within scope" do
-          ["Short", "Average", "Tall"].each do |height|
-            @st.select_from_dropdown(height, "Height", :within => "spouse_form")
-            @st.dropdown_equals("Height", height, :within => "spouse_form").should be_true
+          it "exists within scope" do
+            @st.button_exists("Submit person form", :within => "person_form").should be_true
+            @st.button_exists("Submit spouse form", :within => "spouse_form").should be_true
           end
-        end
 
-        it "option is selected in the dropdown, in table row" do
-          @st.visit("/table")
-          ["Male", "Female"].each do |gender|
-            @st.select_from_dropdown(gender, "Gender", :in_row => "Eric")
-            @st.dropdown_equals("Gender", gender, :in_row => "Eric")
+          it "exists in table row" do
+            # TODO
           end
         end
       end
 
       context "fails when" do
-        it "no such dropdown exists" do
-          @st.dropdown_equals("Eggs", "Over easy").should be_false
-        end
-
-        it "dropdown exists, but the option is not selected" do
-          @st.select_from_dropdown("Short", "Height")
-          @st.dropdown_equals("Height", "Average").should be_false
-          @st.dropdown_equals("Height", "Tall").should be_false
-
-          @st.select_from_dropdown("Average", "Height")
-          @st.dropdown_equals("Height", "Short").should be_false
-          @st.dropdown_equals("Height", "Tall").should be_false
-
-          @st.select_from_dropdown("Tall", "Height")
-          @st.dropdown_equals("Height", "Short").should be_false
-          @st.dropdown_equals("Height", "Average").should be_false
+        it "no such button exists" do
+          @st.button_exists("Apple").should be_false
+          @st.button_exists("Big Red").should be_false
         end
 
-        it "dropdown exists, and option is selected, but not in scope" do
-          @st.select_from_dropdown("Tall", "Height", :within => "person_form")
-          @st.select_from_dropdown("Short", "Height", :within => "spouse_form")
-          @st.dropdown_equals("Height", "Tall", :within => "spouse_form").should be_false
+        it "button exists, but not within scope" do
+          @st.button_exists("Submit spouse form", :within => "person_form").should be_false
+          @st.button_exists("Submit person form", :within => "spouse_form").should be_false
         end
 
-        it "dropdown exists, and option is selected, but not in table row" do
-          @st.visit("/table")
-          @st.select_from_dropdown("Female", "Gender", :in_row => "Eric")
-          @st.select_from_dropdown("Male", "Gender", :in_row => "Marcus")
-          @st.dropdown_equals("Gender", "Female", :in_row => "Marcus").should be_false
+        it "button exists, but not in table row" do
+          # TODO
         end
       end
     end
-  end
+  end # buttons
 
 
-  context "navigation" do
+  context "fields" do
     before(:each) do
-      @st.visit("/").should be_true
+      @st.visit("/form").should be_true
     end
 
-    describe "#visit" do
+    describe "#type_into_field" do
       context "passes when" do
-        it "page exists" do
-          @st.visit("/about").should be_true
+        context "text field with label" do
+          it "exists" do
+            @st.type_into_field("Eric", "First name").should be_true
+            @st.fill_in_with("Last name", "Pierce").should be_true
+          end
+          it "exists within scope" do
+            @st.type_into_field("Eric", "First name", :within => 'person_form').should be_true
+            @st.type_into_field("Andrea", "First name", :within => 'spouse_form').should be_true
+          end
         end
-      end
 
-      context "fails when" do
-        it "page does not exist" do
-          @st.visit("/bad/path").should be_false
+        context "text field with id" do
+          it "exists" do
+            @st.type_into_field("Eric", "first_name").should be_true
+            @st.fill_in_with("last_name", "Pierce").should be_true
+          end
         end
-      end
-    end
 
-    context "reload the current page" do
-      # TODO
-    end
+        context "textarea with label" do
+          it "exists" do
+            @st.type_into_field("Blah blah blah", "Life story").should be_true
+            @st.fill_in_with("Life story", "Jibber jabber").should be_true
+          end
+        end
 
-    describe "#click_back" do
-      it "passes and loads the correct URL" do
-        @st.visit("/about")
-        @st.visit("/")
-        @st.click_back.should be_true
-        @st.see_title("About this site").should be_true
+        context "textarea with id" do
+          it "exists" do
+            @st.type_into_field("Blah blah blah", "biography").should be_true
+            @st.fill_in_with("biography", "Jibber jabber").should be_true
+          end
+        end
       end
 
-      #it "fails when there is no previous page in the history" do
-        # TODO: No obvious way to test this, since everything is running in the
-        # same session
-      #end
-    end
-  end
-
+      context "fails when" do
+        it "no field with the given label or id exists" do
+          @st.type_into_field("Matthew", "Middle name").should be_false
+          @st.fill_in_with("middle_name", "Matthew").should be_false
+        end
 
-  context "links" do
-    before(:each) do
-      @st.visit("/").should be_true
+        it "field exists, but not within scope" do
+          @st.type_into_field("Long story", "Life story",
+                              :within => 'spouse_form').should be_false
+        end
+      end
     end
 
-    describe "#click_link" do
+    describe "#field_contains" do
       context "passes when" do
-        it "link exists" do
-          @st.click_link("About this site").should be_true
-        end
+        context "text field with label" do
+          it "equals the text" do
+            @st.fill_in_with("First name", "Marcus")
+            @st.field_contains("First name", "Marcus").should be_true
+          end
 
-        it "link exists within scope" do
-          @st.click_link("About this site", :within => "header").should be_true
+          it "contains the text" do
+            @st.fill_in_with("First name", "Marcus")
+            @st.field_contains("First name", "Marc").should be_true
+          end
         end
 
-        it "link exists in table row" do
-          @st.visit("/table")
-          @st.click_link("Edit", :in_row => "Marcus").should be_true
-          @st.see_title("Editing Marcus").should be_true
+        context "textarea with label" do
+          it "contains the text" do
+            @st.fill_in_with("Life story", "Blah dee blah")
+            @st.field_contains("Life story", "blah").should be_true
+          end
         end
       end
 
       context "fails when" do
-        it "link does not exist" do
-          @st.click_link("Bogus link").should be_false
-        end
+        context "text field with label" do
+          it "does not exist" do
+            @st.field_contains("Third name", "Smith").should be_false
+          end
 
-        it "link exists, but not within scope" do
-          @st.click_link("About this site", :within => "footer").should be_false
+          it "does not contain the text" do
+            @st.fill_in_with("First name", "Marcus")
+            @st.field_contains("First name", "Eric").should be_false
+          end
         end
 
-        it "link exists, but not in table row" do
-          @st.visit("/table")
-          @st.click_link("Edit", :in_row => "Ken").should be_false
+        context "textarea with label" do
+          it "does not contain the text" do
+            @st.fill_in_with("Life story", "Blah dee blah")
+            @st.field_contains("Life story", "spam").should be_false
+          end
         end
       end
     end
 
-    describe "#link_exists" do
+    describe "#field_equals" do
       context "passes when" do
-        it "link with the given text exists" do
-          @st.link_exists("About this site").should be_true
-          @st.link_exists("Form test").should be_true
+        context "text field with label" do
+          it "equals the text" do
+            @st.fill_in_with("First name", "Ken")
+            @st.field_equals("First name", "Ken").should be_true
+          end
+
+          it "equals the text, and is within scope" do
+            @st.fill_in_with("First name", "Eric", :within => "person_form")
+            @st.field_equals("First name", "Eric", :within => "person_form")
+          end
         end
 
-        it "link with the given text exists within scope" do
-          @st.link_exists("About this site", :within => "header").should be_true
-          @st.link_exists("Form test", :within => "footer").should be_true
-          @st.link_exists("Table test", :within => "footer").should be_true
+        context "textarea with label" do
+          it "equals the text" do
+            @st.fill_in_with("Life story", "Blah dee blah")
+            @st.field_equals("Life story", "Blah dee blah").should be_true
+          end
+
+          it "equals the text, and is within scope" do
+            @st.fill_in_with("Life story", "Blah dee blah",
+                             :within => "person_form")
+            @st.field_equals("Life story", "Blah dee blah",
+                             :within => "person_form").should be_true
+          end
+
+          it "equals the text, and is in table row" do
+            # TODO
+          end
         end
       end
 
       context "fails when" do
-        it "no such link exists" do
-          @st.link_exists("Welcome").should be_false
-          @st.link_exists("Don't click here").should be_false
+        context "text field with label" do
+          it "does not exactly equal the text" do
+            @st.fill_in_with("First name", "Marcus")
+            @st.field_equals("First name", "Marc").should be_false
+          end
         end
 
-        it "link exists, but not within scope" do
-          @st.link_exists("About this site", :within => "footer").should be_false
-          @st.link_exists("Form test", :within => "header").should be_false
-          @st.link_exists("Table test", :within => "header").should be_false
+        context "textarea with label" do
+          it "does not exist" do
+            @st.field_equals("Third name", "Smith").should be_false
+          end
+
+          it "does not exactly equal the text" do
+            @st.fill_in_with("Life story", "Blah dee blah")
+            @st.field_equals("Life story", "Blah dee").should be_false
+          end
+
+          it "exactly equals the text, but is not within scope" do
+            # TODO
+          end
+
+          it "exactly equals the text, but is not in table row" do
+            # TODO
+          end
         end
       end
     end
-  end
+  end # fields
 
 
-  context "buttons" do
+  context "checkboxes" do
     before(:each) do
       @st.visit("/form").should be_true
     end
 
-    describe "#click_button" do
+    describe "#enable_checkbox" do
       context "passes when" do
-        it "button exists and is enabled" do
-          @st.click_button("Submit person form").should be_true
+        context "checkbox with label" do
+          it "exists" do
+            @st.enable_checkbox("I like cheese").should be_true
+            @st.enable_checkbox("I like salami").should be_true
+          end
+
+          it "exists within scope" do
+            @st.enable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
+            @st.enable_checkbox("I like salami", :within => "salami_checkbox").should be_true
+          end
+
+          it "exists in table row" do
+            @st.visit("/table")
+            @st.enable_checkbox("Like", :in_row => "Marcus").should be_true
+          end
         end
 
-        it "button exists within scope" do
-          @st.click_button("Submit person form", :within => "person_form").should be_true
+        context "checkbox with id=" do
+          it "exists" do
+            @st.enable_checkbox("id=like_cheese").should be_true
+          end
         end
 
-        it "button exists in table row" do
-          # TODO
+        context "checkbox with xpath=" do
+          it "exists" do
+            @st.enable_checkbox("xpath=//input[@id='like_cheese']").should be_true
+          end
         end
       end
 
       context "fails when" do
-        it "button does not exist" do
-          @st.click_button("No such button").should be_false
-        end
-
-        it "button exists, but not within scope" do
-          @st.click_button("Submit person form", :within => "spouse_form").should be_false
-        end
+        context "checkbox with label" do
+          it "does not exist" do
+            @st.enable_checkbox("I dislike bacon").should be_false
+            @st.enable_checkbox("I like broccoli").should be_false
+          end
 
-        it "button exists, but not in table row" do
-          # TODO
-        end
+          it "exists, but not within scope" do
+            @st.enable_checkbox("I like cheese", :within => "salami_checkbox").should be_false
+            @st.enable_checkbox("I like salami", :within => "cheese_checkbox").should be_false
+          end
 
-        it "button exists, but is disabled" do
-          # TODO
+          it "exists, but not in table row" do
+            @st.visit("/table")
+            @st.enable_checkbox("Like", :in_row => "Eric").should be_false
+          end
         end
       end
     end
 
-
-    describe "#button_exists" do
+    describe "#disable_checkbox" do
       context "passes when" do
-        context "button with text" do
+        context "checkbox with label" do
           it "exists" do
-            @st.button_exists("Submit person form").should be_true
-            @st.button_exists("Save preferences").should be_true
+            @st.disable_checkbox("I like cheese").should be_true
+            @st.disable_checkbox("I like salami").should be_true
           end
 
           it "exists within scope" do
-            @st.button_exists("Submit person form", :within => "person_form").should be_true
-            @st.button_exists("Submit spouse form", :within => "spouse_form").should be_true
+            @st.disable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
+            @st.disable_checkbox("I like salami", :within => "preferences_form").should be_true
           end
 
           it "exists in table row" do
-            # TODO
+            @st.visit("/table")
+            @st.disable_checkbox("Like", :in_row => "Marcus").should be_true
           end
         end
-      end
-
-      context "fails when" do
-        it "no such button exists" do
-          @st.button_exists("Apple").should be_false
-          @st.button_exists("Big Red").should be_false
-        end
 
-        it "button exists, but not within scope" do
-          @st.button_exists("Submit spouse form", :within => "person_form").should be_false
-          @st.button_exists("Submit person form", :within => "spouse_form").should be_false
+        context "checkbox with id=" do
+          it "exists" do
+            @st.disable_checkbox("id=like_cheese").should be_true
+          end
         end
 
-        it "button exists, but not in table row" do
-          # TODO
+        context "checkbox with xpath=" do
+          it "exists" do
+            @st.disable_checkbox("xpath=//input[@id='like_cheese']").should be_true
+          end
         end
       end
-    end
-  end
 
+      context "fails when" do
+        context "checkbox with label" do
+          it "does not exist" do
+            @st.disable_checkbox("I dislike bacon").should be_false
+            @st.disable_checkbox("I like broccoli").should be_false
+          end
+
+          it "exists, but not within scope" do
+            @st.disable_checkbox("I like cheese", :within => "salami_checkbox").should be_false
+            @st.disable_checkbox("I like salami", :within => "cheese_checkbox").should be_false
+          end
 
-  context "fields" do
-    before(:each) do
-      @st.visit("/form").should be_true
+          it "exists, but not in table row" do
+            @st.visit("/table")
+            @st.disable_checkbox("Like", :in_row => "Eric").should be_false
+          end
+        end
+      end
     end
 
-    describe "#type_into_field" do
+    describe "#checkbox_is_enabled" do
       context "passes when" do
-        context "text field with label" do
-          it "exists" do
-            @st.type_into_field("Eric", "First name").should be_true
-            @st.fill_in_with("Last name", "Pierce").should be_true
+        context "checkbox with label" do
+          it "exists and is checked" do
+            @st.enable_checkbox("I like cheese").should be_true
+            @st.checkbox_is_enabled("I like cheese").should be_true
           end
-          it "exists within scope" do
-            @st.type_into_field("Eric", "First name", :within => 'person_form').should be_true
-            @st.type_into_field("Andrea", "First name", :within => 'spouse_form').should be_true
+
+          it "exists within scope and is checked" do
+            @st.enable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
+            @st.checkbox_is_enabled("I like cheese", :within => "cheese_checkbox").should be_true
           end
-        end
 
-        context "text field with id" do
-          it "exists" do
-            @st.type_into_field("Eric", "first_name").should be_true
-            @st.fill_in_with("last_name", "Pierce").should be_true
+          it "exists in table row and is checked" do
+            @st.visit("/table")
+            @st.enable_checkbox("Like", :in_row => "Ken").should be_true
+            @st.checkbox_is_enabled("Like", :in_row => "Ken").should be_true
           end
         end
+      end
 
-        context "textarea with label" do
-          it "exists" do
-            @st.type_into_field("Blah blah blah", "Life story").should be_true
-            @st.fill_in_with("Life story", "Jibber jabber").should be_true
+      context "fails when" do
+        context "checkbox with label" do
+          it "does not exist" do
+            @st.checkbox_is_enabled("I dislike bacon").should be_false
+          end
+
+          it "exists but is unchecked" do
+            @st.disable_checkbox("I like cheese").should be_true
+            @st.checkbox_is_enabled("I like cheese").should be_false
+          end
+
+          it "exists and is checked, but not within scope" do
+            @st.enable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
+            @st.checkbox_is_enabled("I like cheese", :within => "salami_checkbox").should be_false
+          end
+
+          it "exists and is checked, but not in table row" do
+            @st.visit("/table")
+            @st.enable_checkbox("Like", :in_row => "Marcus").should be_true
+            @st.checkbox_is_enabled("Like", :in_row => "Eric").should be_false
           end
         end
+      end
+    end
 
-        context "textarea with id" do
-          it "exists" do
-            @st.type_into_field("Blah blah blah", "biography").should be_true
-            @st.fill_in_with("biography", "Jibber jabber").should be_true
+    describe "#checkbox_is_disabled" do
+      context "passes when" do
+        context "checkbox with label" do
+          it "exists and is unchecked" do
+            @st.disable_checkbox("I like cheese").should be_true
+            @st.checkbox_is_disabled("I like cheese").should be_true
+          end
+
+          it "exists within scope and is unchecked" do
+            @st.disable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
+            @st.checkbox_is_disabled("I like cheese", :within => "cheese_checkbox").should be_true
+          end
+
+          it "exists in table row and is unchecked" do
+            @st.visit("/table")
+            @st.disable_checkbox("Like", :in_row => "Ken").should be_true
+            @st.checkbox_is_disabled("Like", :in_row => "Ken").should be_true
           end
         end
       end
 
       context "fails when" do
-        it "no field with the given label or id exists" do
-          @st.type_into_field("Matthew", "Middle name").should be_false
-          @st.fill_in_with("middle_name", "Matthew").should be_false
-        end
+        context "checkbox with label" do
+          it "does not exist" do
+            @st.checkbox_is_disabled("I dislike bacon").should be_false
+          end
 
-        it "field exists, but not within scope" do
-          @st.type_into_field("Long story", "Life story",
-                              :within => 'spouse_form').should be_false
+          it "exists but is checked" do
+            @st.enable_checkbox("I like cheese").should be_true
+            @st.checkbox_is_disabled("I like cheese").should be_false
+          end
+
+          it "exists and is unchecked, but not within scope" do
+            @st.disable_checkbox("I like cheese", :within => "cheese_checkbox").should be_true
+            @st.checkbox_is_disabled("I like cheese", :within => "salami_checkbox").should be_false
+          end
+
+          it "exists and is unchecked, but not in table row" do
+            @st.visit("/table")
+            @st.disable_checkbox("Like", :in_row => "Marcus").should be_true
+            @st.checkbox_is_disabled("Like", :in_row => "Eric").should be_false
+          end
         end
       end
     end
+  end # checkboxes
 
-    describe "#field_contains" do
+
+  context "radiobuttons" do
+    before(:each) do
+      @st.visit("/form").should be_true
+    end
+
+    context "#select_radio" do
       context "passes when" do
-        context "text field with label" do
-          it "equals the text" do
-            @st.fill_in_with("First name", "Marcus")
-            @st.field_contains("First name", "Marcus").should be_true
+        context "radiobutton with label" do
+          it "exists" do
+            @st.select_radio("Briefs").should be_true
           end
 
-          it "contains the text" do
-            @st.fill_in_with("First name", "Marcus")
-            @st.field_contains("First name", "Marc").should be_true
+          it "exists within scope" do
+            @st.select_radio("Briefs", :within => "clothing").should be_true
           end
-        end
-
-        context "textarea with label" do
-          it "contains the text" do
-            @st.fill_in_with("Life story", "Blah dee blah")
-            @st.field_contains("Life story", "blah").should be_true
+
+          it "exists in table row" do
+            # TODO
           end
         end
       end
 
       context "fails when" do
-        context "text field with label" do
-          it "does not contain the text" do
-            @st.fill_in_with("First name", "Marcus")
-            @st.field_contains("First name", "Eric").should be_false
+        context "radiobutton with label" do
+          it "does not exist" do
+            @st.select_radio("Naked").should be_false
           end
-        end
 
-        context "textarea with label" do
-          it "does not contain the text" do
-            @st.fill_in_with("Life story", "Blah dee blah")
-            @st.field_contains("Life story", "spam").should be_false
+          it "exists, but not within scope" do
+            @st.select_radio("Briefs", :within => "food").should be_false
+          end
+
+          it "exists, but not in table row" do
+            # TODO
           end
         end
       end
     end
 
-    describe "#field_equals" do
+    context "#radio_is_enabled" do
       context "passes when" do
-        context "text field with label" do
-          it "equals the text" do
-            @st.fill_in_with("First name", "Ken")
-            @st.field_equals("First name", "Ken").should be_true
-          end
-
-          it "equals the text, and is within scope" do
-            @st.fill_in_with("First name", "Eric", :within => "person_form")
-            @st.field_equals("First name", "Eric", :within => "person_form")
-          end
-        end
-
-        context "textarea with label" do
-          it "equals the text" do
-            @st.fill_in_with("Life story", "Blah dee blah")
-            @st.field_equals("Life story", "Blah dee blah").should be_true
+        context "radiobutton with label" do
+          it "exists, and is enabled" do
+            @st.select_radio("Briefs")
+            @st.radio_is_enabled("Briefs").should be_true
           end
 
-          it "equals the text, and is within scope" do
-            @st.fill_in_with("Life story", "Blah dee blah",
-                             :within => "person_form")
-            @st.field_equals("Life story", "Blah dee blah",
-                             :within => "person_form").should be_true
+          it "exists within scope, and is enabled" do
+            @st.select_radio("Briefs", :within => "clothing")
+            @st.radio_is_enabled("Briefs", :within => "clothing").should be_true
           end
 
-          it "equals the text, and is in table row" do
+          it "exists in table row, and is enabled" do
             # TODO
           end
         end
       end
 
       context "fails when" do
-        context "text field with label" do
-          it "does not exactly equal the text" do
-            @st.fill_in_with("First name", "Marcus")
-            @st.field_equals("First name", "Marc").should be_false
-          end
-        end
-
-        context "textarea with label" do
-          it "does not exactly equal the text" do
-            @st.fill_in_with("Life story", "Blah dee blah")
-            @st.field_equals("Life story", "Blah dee").should be_false
+        context "radiobutton with label" do
+          it "does not exist" do
+            @st.radio_is_enabled("Naked").should be_false
           end
 
-          it "exactly equals the text, but is not within scope" do
-            # TODO
+          it "exists, but is not enabled" do
+            @st.select_radio("Briefs")
+            @st.radio_is_enabled("Boxers").should be_false
           end
 
-          it "exactly equals the text, but is not in table row" do
-            # TODO
+          it "exists and is enabled, but not within scope" do
+            @st.select_radio("Briefs", :within => "clothing")
+            @st.radio_is_enabled("Briefs", :within => "food").should be_false
           end
         end
       end
     end
-  end
+  end # radiobuttons
 
 
-  context "visibility" do
+  context "dropdowns" do
     before(:each) do
-      @st.visit("/").should be_true
+      @st.visit("/form").should be_true
     end
 
-    describe "#see" do
+    context "#select_from_dropdown" do
       context "passes when" do
-        it "text is present" do
-          @st.see("Welcome").should be_true
-          @st.see("This is a Sinatra webapp").should be_true
+        it "option exists in the dropdown" do
+          @st.select_from_dropdown("Tall", "Height").should be_true
+          @st.select_from_dropdown("Medium", "Weight").should be_true
+        end
+
+        it "option exists in the dropdown within scope" do
+          @st.select_from_dropdown("Tall", "Height", :within => "spouse_form").should be_true
+        end
+
+        it "option exists in the dropdown in table row" do
+          @st.visit("/table")
+          @st.select_from_dropdown("Male", "Gender", :in_row => "Eric").should be_true
         end
       end
 
       context "fails when" do
-        it "text is absent" do
-          @st.see("Nonexistent").should be_false
-          @st.see("Some bogus text").should be_false
+        it "no such dropdown exists" do
+          @st.select_from_dropdown("Over easy", "Eggs").should be_false
         end
-      end
 
-      it "is case-sensitive" do
-        @st.see("Sinatra webapp").should be_true
-        @st.see("sinatra Webapp").should be_false
+        it "dropdown exists, but the option doesn't" do
+          @st.select_from_dropdown("Giant", "Height").should be_false
+          @st.select_from_dropdown("Obese", "Weight").should be_false
+        end
+
+        it "dropdown exists, but not within scope" do
+          @st.select_from_dropdown("Medium", "Weight", :within => "spouse_form").should be_false
+        end
+
+        it "dropdown exists, but not in table row" do
+          @st.visit("/table")
+          @st.select_from_dropdown("Female", "Gender", :in_row => "First name").should be_false
+        end
       end
     end
 
-    describe "#do_not_see" do
+    context "#dropdown_includes" do
       context "passes when" do
-        it "text is absent" do
-          @st.do_not_see("Nonexistent").should be_true
-          @st.do_not_see("Some bogus text").should be_true
+        it "option exists in the dropdown" do
+          @st.dropdown_includes("Height", "Tall").should be_true
+          @st.dropdown_includes("Weight", "Medium").should be_true
         end
       end
 
       context "fails when" do
-        it "fails when test is present" do
-          @st.do_not_see("Welcome").should be_false
-          @st.do_not_see("This is a Sinatra webapp").should be_false
+        it "dropdown exists, but the option doesn't" do
+          @st.dropdown_includes("Height", "Giant").should be_false
+          @st.dropdown_includes("Weight", "Obese").should be_false
+        end
+
+        it "no such dropdown exists" do
+          @st.dropdown_includes("Eggs", "Over easy").should be_false
         end
       end
+    end
 
-      it "is case-sensitive" do
-        @st.do_not_see("Sinatra webapp").should be_false
-        @st.do_not_see("sinatra Webapp").should be_true
+    context "#dropdown_equals" do
+      context "passes when" do
+        it "option is selected in the dropdown" do
+          ["Short", "Average", "Tall"].each do |height|
+            @st.select_from_dropdown(height, "Height")
+            @st.dropdown_equals("Height", height).should be_true
+          end
+        end
+
+        it "option is selected in the dropdown, within scope" do
+          ["Short", "Average", "Tall"].each do |height|
+            @st.select_from_dropdown(height, "Height", :within => "spouse_form")
+            @st.dropdown_equals("Height", height, :within => "spouse_form").should be_true
+          end
+        end
+
+        it "option is selected in the dropdown, in table row" do
+          @st.visit("/table")
+          ["Male", "Female"].each do |gender|
+            @st.select_from_dropdown(gender, "Gender", :in_row => "Eric")
+            @st.dropdown_equals("Gender", gender, :in_row => "Eric")
+          end
+        end
+      end
+
+      context "fails when" do
+        it "no such dropdown exists" do
+          @st.dropdown_equals("Eggs", "Over easy").should be_false
+        end
+
+        it "dropdown exists, but the option is not selected" do
+          @st.select_from_dropdown("Short", "Height")
+          @st.dropdown_equals("Height", "Average").should be_false
+          @st.dropdown_equals("Height", "Tall").should be_false
+
+          @st.select_from_dropdown("Average", "Height")
+          @st.dropdown_equals("Height", "Short").should be_false
+          @st.dropdown_equals("Height", "Tall").should be_false
+
+          @st.select_from_dropdown("Tall", "Height")
+          @st.dropdown_equals("Height", "Short").should be_false
+          @st.dropdown_equals("Height", "Average").should be_false
+        end
+
+        it "dropdown exists, and option is selected, but not in scope" do
+          @st.select_from_dropdown("Tall", "Height", :within => "person_form")
+          @st.select_from_dropdown("Short", "Height", :within => "spouse_form")
+          @st.dropdown_equals("Height", "Tall", :within => "spouse_form").should be_false
+        end
+
+        it "dropdown exists, and option is selected, but not in table row" do
+          @st.visit("/table")
+          @st.select_from_dropdown("Female", "Gender", :in_row => "Eric")
+          @st.select_from_dropdown("Male", "Gender", :in_row => "Marcus")
+          @st.dropdown_equals("Gender", "Female", :in_row => "Marcus").should be_false
+        end
       end
     end
-  end
+  end # dropdowns
 
 
   context "tables" do
@@ -853,6 +875,159 @@ describe Rsel::SeleniumTest do
       end
     end
 
-  end
+  end # tables
+
+
+  context "stop on error" do
+    before(:each) do
+      @st.visit("/").should be_true
+      @st.stop_on_error = true
+    end
+
+    after(:each) do
+      @st.stop_on_error = false
+    end
+
+    context "causes an exception to be raised" do
+      it "when #see fails" do
+        lambda do
+          @st.see("Nonexistent")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #do_not_see fails" do
+        lambda do
+          @st.do_not_see("Welcome")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #see_title fails" do
+        lambda do
+          @st.see_title("Wrong Title")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #do_not_see_title fails" do
+        lambda do
+          @st.do_not_see_title("Rsel Test Site")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #link_exists fails" do
+        lambda do
+          @st.link_exists("Bogus Link")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #button_exists fails" do
+        lambda do
+          @st.button_exists("Bogus Button")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #row_exists fails" do
+        lambda do
+          @st.row_exists("No, Such, Row")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #type_into_field fails" do
+        lambda do
+          @st.type_into_field("Hello", "Bad Field")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #field_contains fails" do
+        lambda do
+          @st.field_contains("Bad Field", "Hello")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #field_equals fails" do
+        lambda do
+          @st.field_equals("Bad Field", "Hello")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #click fails" do
+        lambda do
+          @st.click("No Such Link")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #click_link fails" do
+        lambda do
+          @st.click_link("No Such Link")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #click_button fails" do
+        lambda do
+          @st.click_button("No Such Link")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #enable_checkbox fails" do
+        lambda do
+          @st.enable_checkbox("No Such Checkbox")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #disable_checkbox fails" do
+        lambda do
+          @st.disable_checkbox("No Such Checkbox")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #checkbox_is_enabled fails" do
+        lambda do
+          @st.checkbox_is_enabled("No Such Checkbox")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #checkbox_is_disabled fails" do
+        lambda do
+          @st.checkbox_is_disabled("No Such Checkbox")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #radio_is_enabled fails" do
+        lambda do
+          @st.radio_is_enabled("No Such Radio")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #radio_is_disabled fails" do
+        lambda do
+          @st.radio_is_disabled("No Such Radio")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #select_radio fails" do
+        lambda do
+          @st.select_radio("No Such Radio")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #select_from_dropdown fails" do
+        lambda do
+          @st.select_from_dropdown("Junk", "No Such Dropdown")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #dropdown_includes fails" do
+        lambda do
+          @st.dropdown_includes("No Such Dropdown", "Junk")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+
+      it "when #dropdown_equals fails" do
+        lambda do
+          @st.dropdown_equals("No Such Dropdown", "Junk")
+        end.should raise_error(Rsel::StopTestStepFailed)
+      end
+    end
+  end # stop on error
+
 end