rsel 0.0.1 → 0.0.2

data/.gitignore

@@ -2,3 +2,4 @@ Gemfile.lock
 .yardoc/*
 .rvmrc
 selenium-rc.log
+pkg/*

data/docs/history.md

@@ -0,0 +1,15 @@
+Rsel History
+============
+
+0.0.2
+-----
+
+- Added `dropdown_includes` and `dropdown_equals`
+- Added `link_exists` and `button_exists`
+
+
+0.0.1
+-----
+
+- Basic visibility, navigation, form fill-in and validation methods
+

data/docs/index.md

@@ -10,4 +10,5 @@ you to use a natural English syntax to write web application tests.
 - [Customization](custom.md)
 - [Development](development.md)
 - [To-do list](todo.md)
+- [History](history.md)
 

data/docs/todo.md

@@ -7,9 +7,8 @@ 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)
 
-Some additional step methods needed:
-
-- dropdown_includes
-- dropdown_equals
-
+Next: [History](history.md)

data/lib/rsel/selenium_test.rb

@@ -114,7 +114,7 @@ module Rsel
     # Reload the current page.
     #
     # @example
-    #   | refresh page |
+    #   | Refresh page |
     #
     def refresh_page
       return_error_status do
@@ -126,7 +126,7 @@ module Rsel
     # Maximize the browser window. May not work in some browsers.
     #
     # @example
-    #   | maximize browser |
+    #   | Maximize browser |
     #
     def maximize_browser
       @browser.window_maximize
@@ -186,6 +186,38 @@ module Rsel
     end
 
 
+    # Ensure that a link exists on the page.
+    #
+    # @param [String] locator
+    #   Text or id of the link, or image alt text
+    #
+    # @example
+    #   | Link | Logout | exists |
+    #   | Link exists | Logout |
+    #
+    # @since 0.0.2
+    #
+    def link_exists(locator)
+      return @browser.element?(xpath('link', locator))
+    end
+
+
+    # Ensure that a button exists on the page.
+    #
+    # @param [String] locator
+    #   Text, value, or id of the button
+    #
+    # @example
+    #   | Button | Search | exists |
+    #   | Button exists | Search |
+    #
+    # @since 0.0.2
+    #
+    def button_exists(locator)
+      return @browser.element?(xpath('button', locator))
+    end
+
+
     # Type a value into the given field.
     #
     # @param [String] text
@@ -271,53 +303,38 @@ module Rsel
     # Click on a link.
     #
     # @param [String] locator
-    #   Link text or id of the anchor element
+    #   Text or id of the link, or image alt text
     #
     # @example
     #   | Click | Logout | link |
     #   | Click link | Logout |
+    #   | Follow | Logout |
     #
     def click_link(locator)
       return_error_status do
         @browser.click(xpath('link', locator))
       end
     end
-
-
-    # Alias for {#click_link}.
-    #
-    # @example
-    #   | Follow | Logout |
-    #
-    def follow(locator)
-      click_link(locator)
-    end
+    alias_method :follow, :click_link
 
 
     # Press a button.
     #
     # @param [String] locator
-    #   Button text, value, or id of the button
+    #   Text, value, or id of the button
     #
     # @example
-    #   | Click | Login | button |
-    #   | Click button | Login |
+    #   | Click | Search | button |
+    #   | Click button | Search |
+    #   | Press | Login |
     #
     def click_button(locator)
+      # TODO: Make this fail when the button is disabled
       return_error_status do
         @browser.click(xpath('button', locator))
       end
     end
-
-
-    # Alias for {#click_button}
-    #
-    # @example
-    #   | Press | Search |
-    #
-    def press(locator)
-      click_button(locator)
-    end
+    alias_method :press, :click_button
 
 
     # Enable (check) a checkbox.
@@ -360,6 +377,8 @@ module Rsel
     # @example
     #   | Checkbox is enabled | send me spam |
     #   | Checkbox | send me spam | is enabled |
+    #   | Radio is enabled | medium |
+    #   | Radio | medium | is enabled |
     #
     def checkbox_is_enabled(locator)
       begin
@@ -370,6 +389,7 @@ module Rsel
         return enabled
       end
     end
+    alias_method :radio_is_enabled, :checkbox_is_enabled
 
 
     # Verify that a given checkbox or radiobutton is disabled (unchecked)
@@ -379,6 +399,9 @@ module Rsel
     #
     # @example
     #   | Checkbox is disabled | send me spam |
+    #   | Checkbox | send me spam | is disabled |
+    #   | Radio is disabled | medium |
+    #   | Radio | medium | is disabled |
     #
     def checkbox_is_disabled(locator)
       begin
@@ -389,6 +412,7 @@ module Rsel
         return !enabled
       end
     end
+    alias_method :radio_is_disabled, :checkbox_is_disabled
 
 
     # Select a radio button.
@@ -407,42 +431,63 @@ module Rsel
     end
 
 
-    # Alias for {#checkbox_is_disabled}
+    # Select an option from a dropdown/combo box.
+    #
+    # @param [String] option
+    #   The option to choose from the dropdown
+    # @param [String] locator
+    #   Label, name, or id of the dropdown
     #
     # @example
-    #   | Radio is disabled | medium |
-    #   | Radio | medium | is disabled |
+    #   | Select | Tall | from | Height | dropdown |
+    #   | Select | Tall | from dropdown | Height |
     #
-    def radio_is_disabled(locator)
-      checkbox_is_disabled(locator)
+    def select_from_dropdown(option, locator)
+      return_error_status do
+        @browser.select(xpath('select', locator), option)
+      end
     end
 
 
-    # Alias for {#checkbox_is_enabled}
+    # Check whether an option exists in a dropdown/combo box.
+    #
+    # @param [String] locator
+    #   Label, name, or id of the dropdown
+    # @param [String] option
+    #   The option to look for
     #
     # @example
-    #   | Radio is enabled | medium |
-    #   | Radio | medium | is enabled |
+    #   | Dropdown | Height | includes | Tall |
+    #
+    # @since 0.0.2
     #
-    def radio_is_enabled(locator)
-      checkbox_is_enabled(locator)
+    def dropdown_includes(locator, option)
+      dropdown = XPath::HTML.select(locator)
+      opt = dropdown[XPath::HTML.option(option)]
+      opt_str = opt.to_xpaths.join(' | ')
+      return @browser.element?("xpath=#{opt_str}")
     end
 
 
-    # Select a value from a dropdown/combo box.
+    # Check whether an option is currently selected in a dropdown/combo box.
     #
-    # @param [String] value
-    #   The value to choose from the dropdown
     # @param [String] locator
     #   Label, name, or id of the dropdown
+    # @param [String] option
+    #   The option you expect to be selected
     #
     # @example
-    #   | select | Tall | from | Height | dropdown |
-    #   | select | Tall | from dropdown | Height |
+    #   | Dropdown | Height | equals | Tall |
     #
-    def select_from_dropdown(value, locator)
-      return_error_status do
-        @browser.select(xpath('select', locator), value)
+    # @since 0.0.2
+    #
+    def dropdown_equals(locator, option)
+      begin
+        selected = @browser.get_selected_label(xpath('select', locator))
+      rescue
+        return false
+      else
+        return selected == option
       end
     end
 
@@ -497,6 +542,7 @@ module Rsel
       end
     end
 
+
     # Return a Selenium-style xpath for the given locator.
     #
     # @param [String] kind

data/rsel.gemspec

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

@@ -1,25 +1,25 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 
 describe Rsel::SeleniumTest do
-  context 'initialization' do
+  context "initialization" do
     before(:each) do
-      @st.visit('/')
+      @st.visit("/")
     end
 
     it "sets correct default configuration" do
-      @st.url.should == 'http://localhost:8070/'
-      @st.browser.host.should == 'localhost'
+      @st.url.should == "http://localhost:8070/"
+      @st.browser.host.should == "localhost"
       @st.browser.port.should == 4444
     end
   end
 
 
-  context 'checkbox' do
+  context "checkbox" do
     before(:each) do
-      @st.visit('/form').should be_true
+      @st.visit("/form").should be_true
     end
 
-    context "enable" do
+    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
@@ -35,7 +35,7 @@ describe Rsel::SeleniumTest do
       end
     end
 
-    context "disable" do
+    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
@@ -50,7 +50,7 @@ describe Rsel::SeleniumTest do
       end
     end
 
-    context "is enabled" do
+    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
@@ -70,7 +70,7 @@ describe Rsel::SeleniumTest do
       end
     end
 
-    context "is disabled" do
+    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
@@ -92,21 +92,21 @@ describe Rsel::SeleniumTest do
   end
 
 
-  context 'dropdown' do
+  context "dropdowns" do
     before(:each) do
-      @st.visit('/form').should be_true
+      @st.visit("/form").should be_true
     end
 
-    context "select" do
+    context "#select_from_dropdown" do
       context "passes when" do
-        it "value exists in a dropdown" 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
       end
 
       context "fails when" do
-        it "dropdown exists, but the value doesn't" do
+        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
@@ -117,18 +117,69 @@ describe Rsel::SeleniumTest do
       end
     end
 
-    context "verify" do
-      # TODO
+    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
+        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
+        end
+
+        it "no such dropdown exists" do
+          @st.dropdown_includes("Eggs", "Over easy").should be_false
+        end
+      end
+    end
+
+    context "#dropdown_equals" do
+      context "passes when" do
+        it "option is selected in the dropdown" do
+          @st.select_from_dropdown("Short", "Height")
+          @st.dropdown_equals("Height", "Short").should be_true
+
+          @st.select_from_dropdown("Average", "Height")
+          @st.dropdown_equals("Height", "Average").should be_true
+
+          @st.select_from_dropdown("Tall", "Height")
+          @st.dropdown_equals("Height", "Tall").should be_true
+        end
+      end
+
+      context "fails when" do
+        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 "no such dropdown exists" do
+          @st.dropdown_equals("Eggs", "Over easy").should be_false
+        end
+      end
     end
   end
 
 
-  context 'navigation' do
+  context "navigation" do
     before(:each) do
-      @st.visit('/').should be_true
+      @st.visit("/").should be_true
     end
 
-    context "visit" do
+    describe "#visit" do
       context "passes when" do
         it "page exists" do
           @st.visit("/about").should be_true
@@ -146,7 +197,7 @@ describe Rsel::SeleniumTest do
       # TODO
     end
 
-    context "go back to the previous page" do
+    describe "#click_back" do
       it "passes and loads the correct URL" do
         @st.visit("/about")
         @st.visit("/")
@@ -159,8 +210,15 @@ describe Rsel::SeleniumTest do
         # same session
       #end
     end
+  end
+
+
+  context "links" do
+    before(:each) do
+      @st.visit("/").should be_true
+    end
 
-    context "clicking a link" do
+    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
@@ -168,18 +226,75 @@ describe Rsel::SeleniumTest do
       end
 
       it "fails when a link does not exist" do
-        @st.follow("Bogus link").should be_false
+        @st.click_link("Bogus link").should be_false
+      end
+    end
+
+    describe "#link_exists" 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
+        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
+        end
+      end
+    end
+  end
+
+
+  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
+      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 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
+      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
       end
     end
   end
 
 
-  context 'text field' do
+  context "fields" do
     before(:each) do
-      @st.visit('/form').should be_true
+      @st.visit("/form").should be_true
     end
 
-    context "type into or fill in" 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
@@ -210,7 +325,7 @@ describe Rsel::SeleniumTest do
       end
     end
 
-    context "should contain" do
+    describe "#field_contains" do
       context "passes when" do
         it "textarea contains the text" do
           @st.fill_in_with("Life story", "Blah dee blah")
@@ -226,7 +341,7 @@ describe Rsel::SeleniumTest do
       end
     end
 
-    context "should equal" do
+    describe "#field_equals" do
       context "passes when" do
         it "textarea equals the text" do
           @st.fill_in_with("Life story", "Blah dee blah")
@@ -244,50 +359,50 @@ describe Rsel::SeleniumTest do
   end
 
 
-  context 'visibility' do
+  context "visibility" do
     before(:each) do
-      @st.visit('/').should be_true
+      @st.visit("/").should be_true
     end
 
-    context "should see" do
+    describe "#see" 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
+          @st.see("Welcome").should be_true
+          @st.see("This is a Sinatra webapp").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
+          @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
+        @st.see("Sinatra webapp").should be_true
+        @st.see("sinatra Webapp").should be_false
       end
     end
 
-    context "should not see" do
+    describe "#do_not_see" 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
+          @st.do_not_see("Nonexistent").should be_true
+          @st.do_not_see("Some bogus text").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
+          @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
+        @st.do_not_see("Sinatra webapp").should be_false
+        @st.do_not_see("sinatra Webapp").should be_true
       end
     end
   end

data/test/app.rb

@@ -21,6 +21,10 @@ class TestApp < Sinatra::Base
     erb :form
   end
 
+  get '/thanks' do
+    erb :thanks
+  end
+
   # Allow shutting down the app with a request
   get '/shutdown' do
     Process.kill('KILL', Process.pid)

data/test/views/thanks.erb

@@ -0,0 +1,8 @@
+<html>
+<head><title>Thanks</title></head>
+<body>
+  <h1>Thank You</h1>
+  <p>We appreciate your feedback</p>
+</body>
+</html>
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsel
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Marcus French
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 -06:00
+date: 2011-07-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -153,6 +153,7 @@ files:
 - Rakefile
 - docs/custom.md
 - docs/development.md
+- docs/history.md
 - docs/index.md
 - docs/install.md
 - docs/todo.md
@@ -168,6 +169,7 @@ files:
 - test/views/about.erb
 - test/views/form.erb
 - test/views/index.erb
+- test/views/thanks.erb
 - vendor/rubyslim-0.1.1/.gitignore
 - vendor/rubyslim-0.1.1/README.md
 - vendor/rubyslim-0.1.1/Rakefile