rsel 0.0.3 → 0.0.4

data/docs/history.md

@@ -1,6 +1,14 @@
 Rsel History
 ============
 
+0.0.4
+-----
+
+- Added `in_row` to scope, for narrowing scope to a specific table row
+- Many more methods accept scope hash now
+- Added (working) `radio_is_enabled` and `radio_is_disabled` methods
+
+
 0.0.3
 -----
 

data/docs/scoping.md

@@ -1,10 +1,16 @@
 Scoping
--------
+=======
 
 Several of the actions and verifications accept an optional hash of scoping
 keywords, allowing you to be specific about what area of the page to operate
-on. For example, you might have a page of contact information with HTML that
-looks something like this:
+on. This page describes how to use them.
+
+
+within
+------
+
+Say you have a page of contact information with HTML that looks something like
+this:
 
     <div id="work">
       <label for="work_phone">Phone number</label>
@@ -43,6 +49,36 @@ Yeah I know, we're still using an `id` which could be annoyingly long, but if
 there are a lot of fields in each container, you only need to keep track of one
 `id` instead of several.
 
+
+in_row
+------
+
+Another kind of scoping that can be useful is `in_row`, which selects only the
+elements that are in the same table row as a given piece of text. For example,
+a common approach to editing or deleting items in a list is to place links next
+to those items in an HTML table:
+
+    <table>
+      <tr><th>Name</th>   <th>Actions</th></tr>
+      <tr><td>Eric</td>   <td><a href="/edit/eric">Edit</a></td></tr>
+      <tr><td>Marcus</td> <td><a href="/edit/marcus">Edit</a></td></tr>
+      <tr><td>Ken</td>    <td><a href="/edit/ken">Edit</a></td></tr>
+    </table>
+
+Here, we have three "Edit" links. Clicking "Edit" without any scoping qualifier
+is ambiguous, and would simply use the first match. If you want to click the
+"Edit" link in a specific row, include an `in_row` scope with some text that is
+unique to that row:
+
+    | Click | Edit | link | !{in_row:Marcus} |
+
+This works for any method that accepts scoping qualifiers, so you can use it to
+operate on checkboxes, dropdowns, or text fields as well.
+
+
+Caveat
+------
+
 One 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,
@@ -63,10 +99,10 @@ be treated as arguments. These are valid alternative ways of calling the same fu
 The `SeleniumTest` method names were, for the most part, crafted so that the
 alternating (function, argument) form reads the most naturally.
 
-As of now, `within` is the only supported scoping keyword, but additional ones
-are being considered. For example, it might be useful to scope to something
-that is `below` another element (such as a heading), or `next_to` an element
-(such as in a table row or list).
+Additional scoping qualifiers may be added to Rsel if they prove useful. If you
+have a use case that isn't covered by the existing scopes, please [submit an
+issue](http://github.com/a-e/rsel/issues), or better yet, implement it yourself
+and submit a pull request. See [Development](development.md) for more info.
 
 Next: [Customization](custom.md)
 

data/docs/todo.md

@@ -7,8 +7,6 @@ To-do list
   mark the step as failed)
 - Find a way to abort a test if something goes catastrophically wrong (such as
   being unable to connect to the Selenium server)
-- Verify the presence of images, links, buttons, checkboxes, etc.
-- Click on images
-- Support scoping qualifiers (somewhat like Kelp does)
+- Verify the presence of images, allow clicking on images
 
 Next: [History](history.md)

data/lib/rsel/selenium_test.rb

@@ -305,9 +305,10 @@ module Rsel
     #
     # @example
     #   | Field | First name | equals | Eric |
+    #   | Field | First name | equals; | Eric | !{within:contact} |
     #
-    def field_equals(locator, text)
-      @browser.field(xpath('field', locator)) == text
+    def field_equals(locator, text, scope={})
+      @browser.field(xpath('field', locator, scope)) == text
     end
 
 
@@ -319,10 +320,11 @@ module Rsel
     # @example
     #   | Click | Next   |
     #   | Click | Logout |
+    #   | Click; | Logout | !{within:header} |
     #
-    def click(locator)
+    def click(locator, scope={})
       return_error_status do
-        @browser.click(xpath('link_or_button', locator))
+        @browser.click(xpath('link_or_button', locator, scope))
       end
     end
 
@@ -338,6 +340,7 @@ module Rsel
     #   | Click | Logout | link |
     #   | Follow | Logout |
     #   | Click | Logout | link | !{within:header} |
+    #   | Click | Edit | link | !{in_row:Eric} |
     #
     def click_link(locator, scope={})
       return_error_status do
@@ -408,7 +411,7 @@ module Rsel
     end
 
 
-    # Verify that a given checkbox or radiobutton is enabled (checked)
+    # Verify that a given checkbox is enabled (checked)
     #
     # @param [String] locator
     #   Label, value, or id of the checkbox to inspect
@@ -417,9 +420,7 @@ module Rsel
     #
     # @example
     #   | Checkbox | send me spam | is enabled |
-    #   | Radio | medium | is enabled |
     #   | Checkbox | send me spam | is enabled | !{within:opt_in} |
-    #   | Radio | medium | is enabled | !{within:shirt_size} |
     #
     def checkbox_is_enabled(locator, scope={})
       xp = xpath('checkbox', locator, scope)
@@ -431,10 +432,34 @@ module Rsel
         return enabled
       end
     end
-    alias_method :radio_is_enabled, :checkbox_is_enabled
 
 
-    # Verify that a given checkbox or radiobutton is disabled (unchecked)
+    # Verify that a given radio button is enabled (checked)
+    #
+    # @param [String] locator
+    #   Label, value, or id of the radio button to inspect
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
+    #
+    # @example
+    #   | Radio | medium | is enabled |
+    #   | Radio | medium | is enabled | !{within:shirt_size} |
+    #
+    # @since 0.0.4
+    #
+    def radio_is_enabled(locator, scope={})
+      xp = xpath('radio_button', locator, scope)
+      begin
+        enabled = @browser.checked?(xp)
+      rescue
+        return false
+      else
+        return enabled
+      end
+    end
+
+
+    # Verify that a given checkbox is disabled (unchecked)
     #
     # @param [String] locator
     #   Label, value, or id of the checkbox to inspect
@@ -443,9 +468,7 @@ module Rsel
     #
     # @example
     #   | Checkbox | send me spam | is disabled |
-    #   | Radio | medium | is disabled |
     #   | Checkbox | send me spam | is disabled | !{within:opt_in} |
-    #   | Radio | medium | is disabled | !{within:shirt_size} |
     #
     def checkbox_is_disabled(locator, scope={})
       xp = xpath('checkbox', locator, scope)
@@ -457,7 +480,31 @@ module Rsel
         return !enabled
       end
     end
-    alias_method :radio_is_disabled, :checkbox_is_disabled
+
+
+    # Verify that a given radio button is disabled (unchecked)
+    #
+    # @param [String] locator
+    #   Label, value, or id of the radio button to inspect
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
+    #
+    # @example
+    #   | Radio | medium | is disabled |
+    #   | Radio | medium | is disabled | !{within:shirt_size} |
+    #
+    # @since 0.0.4
+    #
+    def radio_is_disabled(locator, scope={})
+      xp = xpath('radio_button', locator, scope)
+      begin
+        enabled = @browser.checked?(xp)
+      rescue
+        return false
+      else
+        return !enabled
+      end
+    end
 
 
     # Select a radio button.
@@ -508,7 +555,8 @@ module Rsel
     #
     # @since 0.0.2
     #
-    def dropdown_includes(locator, option)
+    def dropdown_includes(locator, option, scope={})
+      # TODO: Apply scope
       dropdown = XPath::HTML.select(locator)
       opt = dropdown[XPath::HTML.option(option)]
       opt_str = opt.to_s
@@ -528,7 +576,8 @@ module Rsel
     #
     # @since 0.0.2
     #
-    def dropdown_equals(locator, option)
+    def dropdown_equals(locator, option, scope={})
+      # TODO: Apply scope
       begin
         selected = @browser.get_selected_label(xpath('select', locator))
       rescue
@@ -582,6 +631,7 @@ module Rsel
       begin
         yield
       rescue => e
+        #puts e.message
         #puts e.backtrace
         return false
       else
@@ -604,6 +654,9 @@ module Rsel
     # @option scope [String] :within
     #   Restrict scope to elements having this id, matching `locator` only if
     #   it's contained within an element with this id.
+    # @option scope [String] :in_row
+    #   Restrict scope to a table row containing this text, matching `locator`
+    #   only if that locator is in the same row as the given text.
     #
     # @example
     #   xpath('link', 'Log in')
@@ -615,12 +668,10 @@ module Rsel
       loc_xp = XPath::HTML.send(kind, locator)
       if scope[:within]
         parent = XPath.descendant[XPath.attr(:id).equals(scope[:within])]
-        # Prepend the scoping clause to each expression in loc_xp,
-        # then recombine into a union again
-        scoped_expressions = xpath_expressions(loc_xp).collect do |expr|
-          parent.child(expr)
-        end
-        result = XPath::Union.new(*scoped_expressions).to_s
+        result = apply_scope(parent, loc_xp)
+      elsif scope[:in_row]
+        row = XPath.descendant(:tr)[XPath.contains(scope[:in_row])]
+        result = apply_scope(row, loc_xp)
       else
         result = loc_xp.to_s
       end
@@ -628,6 +679,18 @@ module Rsel
     end
 
 
+    # Restrict the scope of all XPath expressions in `inner` by prepending
+    # `container` to each of them, and return new union expression where
+    # `inner` matches only if it's a child of `container`.
+    #
+    def apply_scope(container, inner)
+      scoped_expressions = xpath_expressions(inner).collect do |expr|
+        container.child(expr)
+      end
+      return XPath::Union.new(*scoped_expressions).to_s
+    end
+
+
     # Return an array of individual Expressions in the given XPath::Union, or
     # just `[union]` if it has no sub-expressions. This is an ugly recursive
     # hack, designed to allow splitting up unions into their constituents for

data/rsel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rsel"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   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

@@ -14,27 +14,34 @@ describe Rsel::SeleniumTest do
   end
 
 
-  context "checkbox" do
+  context "checkboxes" do
     before(:each) do
       @st.visit("/form").should be_true
     end
 
     describe "#enable_checkbox" do
-      context "checkbox with label" do
-        context "passes when" do
-          it "is present" 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 "is present within scope" do
+          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
+      end
 
-        context "fails when" do
-          it "is absent" do
+      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
@@ -43,26 +50,38 @@ describe Rsel::SeleniumTest 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
         end
       end
     end
 
     describe "#disable_checkbox" do
-      context "checkbox with label" do
-        context "passes when" do
-          it "is present" 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 "is present within scope" do
+          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
+      end
 
-        context "fails when" do
-          it "is absent" do
+      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
@@ -71,13 +90,18 @@ describe Rsel::SeleniumTest 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
     end
 
     describe "#checkbox_is_enabled" do
-      context "checkbox with label" do
-        context "passes when" 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
@@ -87,9 +111,21 @@ describe Rsel::SeleniumTest 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
         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
 
-        context "fails when" do
           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
@@ -100,16 +136,18 @@ describe Rsel::SeleniumTest do
             @st.checkbox_is_enabled("I like cheese", :within => "salami_checkbox").should be_false
           end
 
-          it "does not exist" do
-            @st.checkbox_is_enabled("I dislike bacon").should be_false
+          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
 
     describe "#checkbox_is_disabled" do
-      context "checkbox with label" do
-        context "passes when" 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
@@ -119,9 +157,21 @@ describe Rsel::SeleniumTest 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
+        context "checkbox with label" do
+          it "does not exist" do
+            @st.checkbox_is_disabled("I dislike bacon").should be_false
+          end
 
-        context "fails when" do
           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
@@ -132,8 +182,89 @@ describe Rsel::SeleniumTest do
             @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
+
+
+  context "radiobuttons" do
+    before(:each) do
+      @st.visit("/form").should be_true
+    end
+
+    context "#select_radio" 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
+        end
+      end
+
+      context "fails when" do
+        context "radiobutton with label" do
           it "does not exist" do
-            @st.checkbox_is_disabled("I dislike bacon").should be_false
+            @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
+        end
+      end
+    end
+
+    context "#radio_is_enabled" 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 "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 "exists in table row, and is enabled" do
+            # TODO
+          end
+        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 "exists, but is not enabled" do
+            @st.select_radio("Briefs")
+            @st.radio_is_enabled("Boxers").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
         end
       end
@@ -156,9 +287,18 @@ describe Rsel::SeleniumTest do
         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 "no such dropdown exists" do
+          @st.select_from_dropdown("Over easy", "Eggs").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
@@ -168,8 +308,9 @@ describe Rsel::SeleniumTest do
           @st.select_from_dropdown("Medium", "Weight", :within => "spouse_form").should be_false
         end
 
-        it "no such dropdown exists" do
-          @st.select_from_dropdown("Over easy", "Eggs").should be_false
+        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
@@ -284,6 +425,12 @@ describe Rsel::SeleniumTest do
         it "link exists within scope" do
           @st.click_link("About this site", :within => "header").should be_true
         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
@@ -294,6 +441,11 @@ describe Rsel::SeleniumTest do
         it "link exists, but not within scope" do
           @st.click_link("About this site", :within => "footer").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
 
@@ -341,6 +493,10 @@ describe Rsel::SeleniumTest do
         it "button exists within scope" do
           @st.click_button("Submit person form", :within => "person_form").should be_true
         end
+
+        it "button exists in table row" do
+          # TODO
+        end
       end
 
       context "fails when" do
@@ -352,22 +508,33 @@ describe Rsel::SeleniumTest do
           @st.click_button("Submit person form", :within => "spouse_form").should be_false
         end
 
-        it "button exists but is disabled" do
+        it "button exists, but not in table row" do
+          # TODO
+        end
+
+        it "button exists, but is disabled" do
           # TODO
         end
       end
     end
 
+
     describe "#button_exists" do
       context "passes when" do
-        it "button with the given text exists" do
-          @st.button_exists("Submit person form").should be_true
-          @st.button_exists("Save preferences").should be_true
-        end
+        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
 
-        it "button with the given text 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
+          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
+
+          it "exists in table row" do
+            # TODO
+          end
         end
       end
 
@@ -381,6 +548,10 @@ describe Rsel::SeleniumTest 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 "button exists, but not in table row" do
+          # TODO
+        end
       end
     end
   end
@@ -393,29 +564,36 @@ describe Rsel::SeleniumTest do
 
     describe "#type_into_field" do
       context "passes when" do
-        it "text field with the given label exists" do
-          @st.type_into_field("Eric", "First name").should be_true
-          @st.fill_in_with("Last name", "Pierce").should be_true
-        end
-
-        it "text field with the given id exists" do
-          @st.type_into_field("Eric", "first_name").should be_true
-          @st.fill_in_with("last_name", "Pierce").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
 
-        it "texarea with the given label 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 "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
 
-        it "texarea with the given id exists" do
-          @st.type_into_field("Blah blah blah", "biography").should be_true
-          @st.fill_in_with("biography", "Jibber jabber").should be_true
+        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
 
-        it "text field with the given label 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
+        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
 
@@ -433,32 +611,64 @@ describe Rsel::SeleniumTest do
 
     describe "#field_contains" do
       context "passes when" do
-        it "textarea contains the text" do
-          @st.fill_in_with("Life story", "Blah dee blah")
-          @st.field_contains("Life story", "blah").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 "textarea does not contain the text" do
-          @st.fill_in_with("Life story", "Blah dee blah")
-          @st.field_contains("Life story", "spam").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 "#field_equals" do
       context "passes when" do
-        it "textarea 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 "text field with label" do
+          # TODO
+        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
+          end
+
+          it "equals the text, and is within scope" do
+            # TODO
+          end
+
+          it "equals the text, and is in table row" do
+            # TODO
+          end
         end
       end
 
       context "fails when" do
-        it "textarea 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 "text field with label" do
+          # TODO
+        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
+          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
@@ -522,21 +732,21 @@ describe Rsel::SeleniumTest do
     describe "#row_exists" do
       context "passes when" do
         it "full row of headings exists" do
-          @st.row_exists("First name, Last name, Nickname, Email").should be_true
+          @st.row_exists("First name, Last name, Email").should be_true
         end
 
         it "partial row of headings exists" do
           @st.row_exists("First name, Last name").should be_true
-          @st.row_exists("Nickname, Email").should be_true
+          @st.row_exists("Last name, Email").should be_true
         end
 
         it "full row of cells exists" do
-          @st.row_exists("Eric, Pierce, epierce, epierce@example.com").should be_true
+          @st.row_exists("Eric, Pierce, epierce@example.com").should be_true
         end
 
         it "partial row of cells exists" do
           @st.row_exists("Eric, Pierce").should be_true
-          @st.row_exists("epierce, epierce@example.com").should be_true
+          @st.row_exists("Pierce, epierce@example.com").should be_true
         end
       end
 
@@ -547,10 +757,11 @@ describe Rsel::SeleniumTest do
 
         it "cell values are not consecutive" do
           @st.row_exists("First name, Email").should be_false
-          @st.row_exists("Eric, epierce").should be_false
+          @st.row_exists("Eric, epierce@example.com").should be_false
         end
       end
     end
+
   end
 end
 

data/test/app.rb

@@ -13,20 +13,8 @@ class TestApp < Sinatra::Base
     erb :index
   end
 
-  get '/about' do
-    erb :about
-  end
-
-  get '/form' do
-    erb :form
-  end
-
-  get '/table' do
-    erb :table
-  end
-
-  get '/thanks' do
-    erb :thanks
+  get '/:view' do |view|
+    erb view.to_sym
   end
 
   # Allow shutting down the app with a request

data/test/views/edit_eric.erb

@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+<head><title>Editing Eric</title></head>
+<body>
+  <h1>Editing Eric</h1>
+</body>
+</html>

data/test/views/edit_marcus.erb

@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+<head><title>Editing Marcus</title></head>
+<body>
+  <h1>Editing Marcus</h1>
+</body>
+</html>

data/test/views/form.erb

@@ -80,7 +80,13 @@
         <label for="like_salami">I like salami</label>
         <input id="like_salami" type="checkbox" />
       </p>
-      <table>
+      <p id="clothing">
+        <label for="boxers">Boxers</label>
+        <input id="boxers" type="radio" name="underwear" value="boxers" />
+        <label for="briefs">Briefs</label>
+        <input id="briefs" type="radio" name="underwear" value="briefs" />
+      </p>
+      <table id="food">
         <tr>
           <th>Apple</th>
           <td>

data/test/views/table.erb

@@ -8,14 +8,56 @@
     <tr>
       <th>First name</th>
       <th>Last name</th>
-      <th>Nickname</th>
       <th>Email</th>
+      <th>Actions</th>
     </tr>
     <tr>
       <td>Eric</td>
       <td>Pierce</td>
-      <td>epierce</td>
       <td>epierce@example.com</td>
+      <td>
+        <a href="/edit_eric">Edit</a>
+
+        <label for="eric_gender">Gender</a>
+        <select id="eric_gender">
+          <option value="male">Male</option>
+          <option value="female">Female</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>Marcus</td>
+      <td>French</td>
+      <td>mfrench@example.com</td>
+      <td>
+        <a href="/edit_marcus">Edit</a>
+
+        <label for="like_marcus">Like</label>
+        <input id="like_marcus" type="checkbox"/>
+
+        <label for="marcus_gender">Gender</a>
+        <select id="marcus_gender">
+          <option value="male">Male</option>
+          <option value="female">Female</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>Ken</td>
+      <td>Brazier</td>
+      <td>kbrazier@example.com</td>
+      <td>
+        (read-only)
+
+        <label for="like_ken">Like</label>
+        <input id="like_ken" type="checkbox"/>
+
+        <label for="ken_gender">Gender</a>
+        <select id="ken_gender">
+          <option value="male">Male</option>
+          <option value="female">Female</option>
+        </select>
+      </td>
     </tr>
   </table>
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsel
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Marcus French
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-23 00:00:00 -06:00
+date: 2011-07-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -170,6 +170,9 @@ files:
 - test/app.rb
 - test/config.ru
 - test/views/about.erb
+- test/views/edit_eric.erb
+- test/views/edit_marcus.erb
+- test/views/favicon.ico.erb
 - test/views/form.erb
 - test/views/index.erb
 - test/views/table.erb