rsel 0.0.2 → 0.0.3

data/docs/history.md

@@ -1,6 +1,17 @@
 Rsel History
 ============
 
+0.0.3
+-----
+
+- Added `row_exists`, for verifying the presence of a table row
+- Added `scope` hash with support for `within` clause on most methods
+- Bugfix for `pause_seconds` (was waiting 1000 times too long)
+- Fix behavior of enable/disable checkbox, so onclick events will fire
+- Tell Selenium to highlight located elements
+- XPath 0.1.4 is now required
+
+
 0.0.2
 -----
 

data/docs/index.md

@@ -7,6 +7,7 @@ you to use a natural English syntax to write web application tests.
 
 - [Installation & Configuration](install.md)
 - [Usage](usage.md)
+- [Scoping](scoping.md)
 - [Customization](custom.md)
 - [Development](development.md)
 - [To-do list](todo.md)

data/docs/scoping.md

@@ -0,0 +1,72 @@
+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:
+
+    <div id="work">
+      <label for="work_phone">Phone number</label>
+      <input id="work_phone" type="text" />
+    </div>
+
+    <div id="home">
+      <label for="home_phone">Phone number</label>
+      <input id="home_phone" type="text" />
+    </div>
+
+Notice that both text inputs are labeled "Phone number", which means that if
+you try to do this in your Rsel table:
+
+    | Type | 123-456-7890 | into | Phone number | field |
+
+Rsel will just fill in the first matching field that it finds (in this case,
+the "work" phone number). If you needed to fill in the "home" phone number,
+you'd have to refer to it by something less ambiguous, such as its `id`:
+
+    | Type | 123-456-7890 | into | home_phone | field |
+
+In this case, the `id` is short and intelligible, so it's not such a bad thing,
+but it's fairly common for the `id` to be autogenerated, in which case it might
+have some ridiculous-looking string like `form_customer_contact_field_home_phone_0`,
+and you'd like to avoid that.
+
+This is where scoping comes in. Scoping in Rsel allows you to be more specific
+about which "Phone number" field you want to type into, by specifying the `id`
+of its container:
+
+    | Type | 111-222-3333 | into | Phone number | field | !{within:work} |
+    | Type | 111-222-4444 | into | Phone number | field | !{within:home} |
+
+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.
+
+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,
+argument) chunks; the way the above example breaks down is:
+
+    | Type |              | into |              | field |                |
+    |      | 111-222-3333 |      | Phone number |       | !{within:work} |
+
+That is, this row calls the `type_into_field` method with three arguments
+(`111-222-3333`, `Phone number`, `!{within:work}`). If you're using a function
+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 |
+
+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).
+
+Next: [Customization](custom.md)
+

data/docs/usage.md

@@ -46,5 +46,5 @@ driver frowns upon it.)
 See the `SeleniumTest` class documentation for a full list of available methods
 and how to use them.
 
-Next: [Customization](custom.md)
+Next: [Scoping](scoping.md)
 

data/lib/rsel/selenium_test.rb

@@ -59,6 +59,8 @@ module Rsel
     # @example
     #   | Open browser |
     #
+    # @raise [SeleniumNotRunning] if Selenium connection cannot be made
+    #
     def open_browser
       begin
         @browser.start_new_browser_session
@@ -68,6 +70,8 @@ module Rsel
       else
         visit @url
       end
+      # Make Selenium highlight elements whenever it locates them
+      @browser.highlight_located_element = true
     end
 
 
@@ -190,15 +194,17 @@ module Rsel
     #
     # @param [String] locator
     #   Text or id of the link, or image alt text
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
     #
     # @example
     #   | Link | Logout | exists |
-    #   | Link exists | Logout |
+    #   | Link | Logout | exists | !{within:header} |
     #
     # @since 0.0.2
     #
-    def link_exists(locator)
-      return @browser.element?(xpath('link', locator))
+    def link_exists(locator, scope={})
+      return @browser.element?(xpath('link', locator, scope))
     end
 
 
@@ -206,15 +212,34 @@ module Rsel
     #
     # @param [String] locator
     #   Text, value, or id of the button
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
     #
     # @example
     #   | Button | Search | exists |
-    #   | Button exists | Search |
+    #   | Button | Search | exists | !{within:members} |
     #
     # @since 0.0.2
     #
-    def button_exists(locator)
-      return @browser.element?(xpath('button', locator))
+    def button_exists(locator, scope={})
+      return @browser.element?(xpath('button', locator, scope))
+    end
+
+
+    # Ensure that a table row with the given cell values exists.
+    #
+    # @param [String] cells
+    #   Comma-separated cell values you expect to see
+    #
+    # @example
+    #   | Row exists | First, Middle, Last, Email |
+    #   | Row | First, Middle, Last, Email | exists |
+    #
+    # @since 0.0.3
+    #
+    def row_exists(cells)
+      row = XPath.descendant(:tr)[XPath::HTML.table_row(cells.split(/, */))]
+      return @browser.element?("xpath=#{row.to_s}")
     end
 
 
@@ -224,14 +249,16 @@ module Rsel
     #   What to type into the field
     # @param [String] locator
     #   Label, name, or id of the field you want to type into
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
     #
     # @example
-    #   | Type | Dale | into field | First name |
     #   | Type | Dale | into | First name | field |
+    #   | Type | Dale | into | First name | field | !{within:contact} |
     #
-    def type_into_field(text, locator)
+    def type_into_field(text, locator, scope={})
       return_error_status do
-        @browser.type(xpath('field', locator), text)
+        @browser.type(xpath('field', locator, scope), text)
       end
     end
 
@@ -304,15 +331,17 @@ module Rsel
     #
     # @param [String] locator
     #   Text or id of the link, or image alt text
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
     #
     # @example
     #   | Click | Logout | link |
-    #   | Click link | Logout |
     #   | Follow | Logout |
+    #   | Click | Logout | link | !{within:header} |
     #
-    def click_link(locator)
+    def click_link(locator, scope={})
       return_error_status do
-        @browser.click(xpath('link', locator))
+        @browser.click(xpath('link', locator, scope))
       end
     end
     alias_method :follow, :click_link
@@ -322,49 +351,59 @@ module Rsel
     #
     # @param [String] locator
     #   Text, value, or id of the button
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
     #
     # @example
     #   | Click | Search | button |
-    #   | Click button | Search |
     #   | Press | Login |
+    #   | Click | Search | button | !{within:customers} |
     #
-    def click_button(locator)
+    def click_button(locator, scope={})
       # TODO: Make this fail when the button is disabled
       return_error_status do
-        @browser.click(xpath('button', locator))
+        @browser.click(xpath('button', locator, scope))
       end
     end
     alias_method :press, :click_button
 
 
-    # Enable (check) a checkbox.
+    # Enable (check) a checkbox by clicking on it.
+    # If the checkbox is already enabled, do nothing.
     #
     # @param [String] locator
     #   Label, value, or id of the checkbox to check
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
     #
     # @example
     #   | Enable | Send me spam | checkbox |
-    #   | Enable checkbox | Send me spam |
+    #   | Enable | Send me spam | checkbox | !{within:opt_in} |
     #
-    def enable_checkbox(locator)
+    def enable_checkbox(locator, scope={})
+      return true if checkbox_is_enabled(locator, scope)
       return_error_status do
-        @browser.check(xpath('checkbox', locator))
+        @browser.click(xpath('checkbox', locator, scope))
       end
     end
 
 
-    # Disable (uncheck) a checkbox.
+    # Disable (uncheck) a checkbox by clicking on it.
+    # If the checkbox is already disabled, do nothing.
     #
     # @param [String] locator
     #   Label, value, or id of the checkbox to uncheck
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
     #
     # @example
     #   | Disable | Send me spam | checkbox |
-    #   | Disable checkbox | Send me spam |
+    #   | Disable | Send me spam | checkbox | !{within:opt_in} |
     #
-    def disable_checkbox(locator)
+    def disable_checkbox(locator, scope={})
+      return true if checkbox_is_disabled(locator, scope)
       return_error_status do
-        @browser.uncheck(xpath('checkbox', locator))
+        @browser.click(xpath('checkbox', locator, scope))
       end
     end
 
@@ -373,16 +412,19 @@ module Rsel
     #
     # @param [String] locator
     #   Label, value, or id of the checkbox to inspect
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
     #
     # @example
-    #   | Checkbox is enabled | send me spam |
     #   | Checkbox | send me spam | is enabled |
-    #   | Radio is enabled | medium |
     #   | 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)
+    def checkbox_is_enabled(locator, scope={})
+      xp = xpath('checkbox', locator, scope)
       begin
-        enabled = @browser.checked?(xpath('checkbox', locator))
+        enabled = @browser.checked?(xp)
       rescue
         return false
       else
@@ -396,16 +438,19 @@ module Rsel
     #
     # @param [String] locator
     #   Label, value, or id of the checkbox to inspect
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
     #
     # @example
-    #   | Checkbox is disabled | send me spam |
     #   | Checkbox | send me spam | is disabled |
-    #   | Radio is disabled | medium |
     #   | 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)
+    def checkbox_is_disabled(locator, scope={})
+      xp = xpath('checkbox', locator, scope)
       begin
-        enabled = @browser.checked?(xpath('checkbox', locator))
+        enabled = @browser.checked?(xp)
       rescue
         return false
       else
@@ -419,14 +464,16 @@ module Rsel
     #
     # @param [String] locator
     #   Label, id, or name of the radio button to select
+    # @param [Hash] scope
+    #   Scoping keywords as understood by {#xpath}
     #
     # @example
     #   | Select | female | radio |
-    #   | Select radio | female |
+    #   | Select | female | radio | !{within:gender} |
     #
-    def select_radio(locator)
+    def select_radio(locator, scope={})
       return_error_status do
-        @browser.click(xpath('radio_button', locator))
+        @browser.click(xpath('radio_button', locator, scope))
       end
     end
 
@@ -442,9 +489,9 @@ module Rsel
     #   | Select | Tall | from | Height | dropdown |
     #   | Select | Tall | from dropdown | Height |
     #
-    def select_from_dropdown(option, locator)
+    def select_from_dropdown(option, locator, scope={})
       return_error_status do
-        @browser.select(xpath('select', locator), option)
+        @browser.select(xpath('select', locator, scope), option)
       end
     end
 
@@ -464,7 +511,7 @@ module Rsel
     def dropdown_includes(locator, option)
       dropdown = XPath::HTML.select(locator)
       opt = dropdown[XPath::HTML.option(option)]
-      opt_str = opt.to_xpaths.join(' | ')
+      opt_str = opt.to_s
       return @browser.element?("xpath=#{opt_str}")
     end
 
@@ -504,6 +551,7 @@ module Rsel
       sleep seconds.to_i
       return true
     end
+    alias_method :pause_secs, :pause_seconds
 
 
     # Wait some number of seconds for the current page request to finish.
@@ -517,7 +565,7 @@ module Rsel
     #
     def page_loads_in_seconds_or_less(seconds)
       return_error_status do
-        @browser.wait_for_page_to_load("#{seconds}000")
+        @browser.wait_for_page_to_load(seconds)
       end
     end
 
@@ -534,7 +582,6 @@ module Rsel
       begin
         yield
       rescue => e
-        #puts e.message
         #puts e.backtrace
         return false
       else
@@ -543,24 +590,62 @@ module Rsel
     end
 
 
-    # Return a Selenium-style xpath for the given locator.
+    # Return a Selenium-style xpath generated by calling `XPath::HTML.<kind>`
+    # with the given `locator`.
     #
     # @param [String] kind
     #   What kind of locator you're using (link, button, checkbox, field etc.).
     #   This must correspond to a method name in `XPath::HTML`.
     # @param [String] locator
-    #   Name, id, value, label or whatever locator the `XPath::HTML.<kind>`
-    #   method accepts.
+    #   Name, id, value, label or whatever other locators are accepted by
+    #   `XPath::HTML.<kind>`
+    # @param [Hash] scope
+    #   Keywords to restrict the scope of matching elements
+    # @option scope [String] :within
+    #   Restrict scope to elements having this id, matching `locator` only if
+    #   it's contained within an element with this id.
     #
     # @example
     #   xpath('link', 'Log in')
     #   xpath('button', 'Submit')
     #   xpath('field', 'First name')
+    #   xpath('table_row', ['First', 'Last'])
+    #
+    def xpath(kind, locator, scope={})
+      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
+      else
+        result = loc_xp.to_s
+      end
+      return "xpath=#{result}"
+    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
+    # the purpose of modifying them individually and re-combining them.
     #
-    def xpath(kind, locator)
-      # Doing explicit string-join here, so it'll work with older versions
-      # of the XPath module that don't have `Union#to_s` defined.
-      "xpath=" + XPath::HTML.send(kind, locator).to_xpaths.join(' | ')
+    # @param [XPath::Union, XPath::Expression] union
+    #   The xpath you want to break down into individual expressions
+    #
+    # @since 0.0.3
+    #
+    def xpath_expressions(union)
+      if union.respond_to?(:expressions)
+        return union.expressions.collect do |expr|
+          xpath_expressions(expr)
+        end.flatten
+      else
+        return [union]
+      end
     end
 
   end

data/rsel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rsel"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.summary = "Runs Selenium tests from FitNesse"
   s.description = <<-EOS
     Rsel provides a Slim fixture for running Selenium tests, with
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.add_dependency 'rubyslim-unofficial'
-  s.add_dependency 'xpath'
+  s.add_dependency 'xpath', '>= 0.1.4'
   s.add_dependency 'selenium-client'
 
   s.add_development_dependency 'rake', '0.8.7'

data/spec/selenium_test_spec.rb

@@ -20,72 +20,121 @@ describe Rsel::SeleniumTest do
     end
 
     describe "#enable_checkbox" do
-      context "passes when" do
-        it "checkbox with the given label is present" do
-          @st.enable_checkbox("I like cheese").should be_true
-          @st.enable_checkbox("I like salami").should be_true
+      context "checkbox with label" do
+        context "passes when" do
+          it "is present" 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
+            @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
         end
-      end
 
-      context "fails when" do
-        it "checkbox with the given label is absent" do
-          @st.enable_checkbox("I dislike bacon").should be_false
-          @st.enable_checkbox("I like broccoli").should be_false
+        context "fails when" do
+          it "is absent" 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
         end
       end
     end
 
     describe "#disable_checkbox" do
-      context "passes when" do
-        it "checkbox with the given label is present" do
-          @st.disable_checkbox("I like cheese").should be_true
-          @st.disable_checkbox("I like salami").should be_true
+      context "checkbox with label" do
+        context "passes when" do
+          it "is present" 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
+            @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
         end
-      end
-      context "fails when" do
-        it "checkbox with the given label is absent" do
-          @st.disable_checkbox("I dislike bacon").should be_false
-          @st.disable_checkbox("I like broccoli").should be_false
+
+        context "fails when" do
+          it "is absent" 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
         end
       end
     end
 
     describe "#checkbox_is_enabled" do
-      context "passes when" do
-        it "checkbox with the given label 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
-      end
+      context "checkbox with label" do
+        context "passes when" 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
 
-      context "fails when" do
-        it "checkbox with the given label exists but is unchecked" do
-          @st.disable_checkbox("I like cheese").should be_true
-          @st.checkbox_is_enabled("I like cheese").should be_false
+          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
 
-        it "checkbox with the given label does not exist" do
-          @st.checkbox_is_enabled("I dislike bacon").should be_false
+        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
+          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 "does not exist" do
+            @st.checkbox_is_enabled("I dislike bacon").should be_false
+          end
         end
       end
     end
 
     describe "#checkbox_is_disabled" do
-      context "passes when" do
-        it "checkbox with the given label 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
-      end
+      context "checkbox with label" do
+        context "passes when" 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
 
-      context "fails when" do
-        it "checkbox with the given label exists but is checked" do
-          @st.enable_checkbox("I like cheese").should be_true
-          @st.checkbox_is_disabled("I like cheese").should be_false
+          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
         end
 
-        it "checkbox with the given label does not exist" do
-          @st.checkbox_is_disabled("I dislike bacon").should be_false
+        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
+          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 "does not exist" do
+            @st.checkbox_is_disabled("I dislike bacon").should be_false
+          end
         end
       end
     end
@@ -103,6 +152,10 @@ describe Rsel::SeleniumTest 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
       end
 
       context "fails when" do
@@ -111,6 +164,10 @@ describe Rsel::SeleniumTest do
           @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 "no such dropdown exists" do
           @st.select_from_dropdown("Over easy", "Eggs").should be_false
         end
@@ -219,14 +276,24 @@ describe Rsel::SeleniumTest do
     end
 
     describe "#click_link" do
-      it "passes and loads the correct page when a link exists" do
-        @st.click_link("About this site").should be_true
-        @st.see_title("About this site").should be_true
-        @st.see("This site is really cool").should be_true
+      context "passes when" do
+        it "link exists" do
+          @st.click_link("About this site").should be_true
+        end
+
+        it "link exists within scope" do
+          @st.click_link("About this site", :within => "header").should be_true
+        end
       end
 
-      it "fails when a link does not exist" do
-        @st.click_link("Bogus link").should be_false
+      context "fails when" do
+        it "link does not exist" do
+          @st.click_link("Bogus link").should be_false
+        end
+
+        it "link exists, but not within scope" do
+          @st.click_link("About this site", :within => "footer").should be_false
+        end
       end
     end
 
@@ -236,6 +303,12 @@ describe Rsel::SeleniumTest do
           @st.link_exists("About this site").should be_true
           @st.link_exists("Form test").should be_true
         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
+        end
       end
 
       context "fails when" do
@@ -243,6 +316,12 @@ describe Rsel::SeleniumTest do
           @st.link_exists("Welcome").should be_false
           @st.link_exists("Don't click here").should be_false
         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
+        end
       end
     end
   end
@@ -258,6 +337,10 @@ describe Rsel::SeleniumTest do
         it "button exists and is enabled" do
           @st.click_button("Submit person form").should be_true
         end
+
+        it "button exists within scope" do
+          @st.click_button("Submit person form", :within => "person_form").should be_true
+        end
       end
 
       context "fails when" do
@@ -265,6 +348,10 @@ describe Rsel::SeleniumTest 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
+
         it "button exists but is disabled" do
           # TODO
         end
@@ -277,6 +364,11 @@ describe Rsel::SeleniumTest 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
+        end
       end
 
       context "fails when" do
@@ -284,6 +376,11 @@ describe Rsel::SeleniumTest 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
+        end
       end
     end
   end
@@ -315,6 +412,11 @@ describe Rsel::SeleniumTest do
           @st.type_into_field("Blah blah blah", "biography").should be_true
           @st.fill_in_with("biography", "Jibber jabber").should be_true
         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
+        end
       end
 
       context "fails when" do
@@ -322,6 +424,10 @@ describe Rsel::SeleniumTest do
           @st.type_into_field("Matthew", "Middle name").should be_false
           @st.fill_in_with("middle_name", "Matthew").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
+        end
       end
     end
 
@@ -407,5 +513,44 @@ describe Rsel::SeleniumTest do
     end
   end
 
+
+  context "tables" do
+    before(:each) do
+      @st.visit("/table").should be_true
+    end
+
+    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
+        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
+        end
+
+        it "full row of cells exists" do
+          @st.row_exists("Eric, Pierce, epierce, 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
+        end
+      end
+
+      context "fails when" do
+        it "no row exists" do
+          @st.row_exists("Middle name, Maiden name, Email").should be_false
+        end
+
+        it "cell values are not consecutive" do
+          @st.row_exists("First name, Email").should be_false
+          @st.row_exists("Eric, epierce").should be_false
+        end
+      end
+    end
+  end
 end
 

data/test/app.rb

@@ -21,6 +21,10 @@ class TestApp < Sinatra::Base
     erb :form
   end
 
+  get '/table' do
+    erb :table
+  end
+
   get '/thanks' do
     erb :thanks
   end

data/test/views/form.erb

@@ -21,8 +21,8 @@
         </textarea>
       </p>
       <p>
-        <label for="height">Height</label>
-        <select id="height">
+        <label for="person_height">Height</label>
+        <select id="person_height">
           <option value="short">Short</option>
           <option value="average" selected="selected">Average</option>
           <option value="tall" >Tall</option>
@@ -40,6 +40,28 @@
     </form>
   </div>
 
+  <div id="spouse_form">
+    <form action="/thanks" method="get">
+      <p>
+        <label for="spouse_first_name">First name</label>
+        <input id="spouse_first_name" type="text" />
+      </p>
+      <p>
+        <label for="spouse_last_name">Last name</label>
+        <input id="spouse_last_name" type="text" />
+      </p>
+      <p>
+        <label for="spouse_height">Height</label>
+        <select id="spouse_height">
+          <option value="short">Short</option>
+          <option value="average" selected="selected">Average</option>
+          <option value="tall" >Tall</option>
+        </select>
+      </p>
+      <p><button value="submit_spouse_form">Submit spouse form</button></p>
+    </form>
+  </div>
+
   <div id="preferences_form">
     <form action="/thanks" method="get">
       <p>
@@ -50,11 +72,11 @@
           <option value="b">Blue</option>
         </select>
       </p>
-      <p>
+      <p id="cheese_checkbox">
         <label for="like_cheese">I like cheese</label>
         <input id="like_cheese" type="checkbox" checked="checked"/>
       </p>
-      <p>
+      <p id="salami_checkbox">
         <label for="like_salami">I like salami</label>
         <input id="like_salami" type="checkbox" />
       </p>

data/test/views/index.erb

@@ -5,9 +5,17 @@
   <h1>Welcome</h1>
   <p>This is a Sinatra webapp for unit testing Rsel.</p>
 
-  <div id="links">
-    <a href="/about">About this site</a>
-    <a href="/form">Form test</a>
+  <div id="header">
+    <ul>
+      <li><a href="/about">About this site</a></li>
+    </ul>
+  </div>
+
+  <div id="footer">
+    <ul>
+      <li><a href="/form">Form test</a></li>
+      <li><a href="/table">Table test</a></li>
+    </ul>
   </div>
 
 </body>

data/test/views/table.erb

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head><title>Rsel Table test</title></head>
+<body>
+  <h1>Tables</h1>
+
+  <table id="contact">
+    <tr>
+      <th>First name</th>
+      <th>Last name</th>
+      <th>Nickname</th>
+      <th>Email</th>
+    </tr>
+    <tr>
+      <td>Eric</td>
+      <td>Pierce</td>
+      <td>epierce</td>
+      <td>epierce@example.com</td>
+    </tr>
+  </table>
+
+</body>
+</html>
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsel
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Marcus French
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 -06:00
+date: 2011-07-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,10 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 4
+        version: 0.1.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -156,6 +158,7 @@ files:
 - docs/history.md
 - docs/index.md
 - docs/install.md
+- docs/scoping.md
 - docs/todo.md
 - docs/usage.md
 - lib/rsel.rb
@@ -169,6 +172,7 @@ files:
 - test/views/about.erb
 - test/views/form.erb
 - test/views/index.erb
+- test/views/table.erb
 - test/views/thanks.erb
 - vendor/rubyslim-0.1.1/.gitignore
 - vendor/rubyslim-0.1.1/README.md