page-object 0.5.1 → 0.5.2

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2-p290@page-object --create
+rvm 1.9.3-p0@page-object --create

data/ChangeLog

@@ -1,4 +1,12 @@
-=== Version 0.5.1 / 2011-11-16
+=== Version 0.5.2 / 2011-11-30
+* Enhancements
+  * Added ability to find image buttons by src
+  * Added ability to find image button by alt
+  * Added first_row and last_row methods to Table
+  * Updated to use selenium-webdriver 2.14.0
+  * Updated to use watir-webdriver 0.3.9
+
+=== Version 0.5.1 / 2011-11-18
 * Enhancements
   * Added instance level in_frame method
   * Support for nesting all *_element instance methods inside in_frame call

data/features/button.feature

@@ -6,9 +6,21 @@ Feature: Button
   Background:
     Given I am on the static elements page
 
-  Scenario: Getting the text from a div
+  Scenario: Clicking a button (type=submit)
     When I click the button
     Then I should be on the success page
+    
+  Scenario: Clicking a button (type=image)
+    When I click the button with type image
+    Then I should be on the success page
+    
+  Scenario: Clicking an image button by src
+    When I click the image button using src
+    Then I should be on the success page
+
+  Scenario: Clicking an image button by alt
+    When I click the image button using alt
+    Then I should be on the success page
 
   Scenario: Retrieve a button element
     When I retrieve a button element

data/features/element.feature

@@ -9,6 +9,12 @@ Feature: Elements
     When I clear the text field
     Then the text field should contain ""
 
+  Scenario: Elements enabled?
+    When I check an enabled button
+    Then it should know it is enabled
+    When I check a disabled button
+    Then it should know it is not enabled
+
   Scenario: Link element methods
     When I retrieve a link element
     Then I should know it exists

data/features/html/static_elements.html

@@ -46,8 +46,10 @@
     </table>
 
     <form method="get" action="success.html">
-        <input id='button_id' name='button_name' class='button_class' type="submit" value="Click Me">
+        <input id='button_id' name='button_name' class='button_class' type="submit" value="Click Me"/>
+        <input id='button_image_id' type='image' src='images/submit.gif' alt='Submit'/>
         <button type='button' id='btn_id' name='btn_name' class='btn_class'>Click Me Too</button>
+        <input value="Disabled" disabled="true" type ="submit"/>
     </form>
 
     <img src="images/circle.png" id="image_id" name="image_name" class="image_class">

data/features/step_definitions/button_steps.rb

@@ -2,6 +2,18 @@ When /^I click the button$/ do
   @page.button_id
 end
 
+When /^I click the button with type image$/ do
+  @page.button_image_id
+end
+
+When /^I click the image button using src$/ do
+  @page.button_image_src
+end
+
+When /^I click the image button using alt$/ do
+  @page.button_image_alt
+end
+
 When /^I search for the button by "([^\"]*)"$/ do |how|
   @how = how
 end

data/features/step_definitions/element_steps.rb

@@ -107,3 +107,19 @@ end
 When /^I clear the text field$/ do
   @page.text_field_id_element.clear
 end
+
+When /^I check an enabled button$/ do
+  @element = @page.button_id_element
+end
+
+Then /^it should know it is enabled$/ do
+  @element.should be_enabled
+end
+
+When /^I check a disabled button$/ do
+  @element = @page.disabled_button_element
+end
+
+Then /^it should know it is not enabled$/ do
+  @element.should_not be_enabled
+end

data/features/step_definitions/table_steps.rb

@@ -1,4 +1,4 @@
-Then /^the data for row "([^"]*)" should be "([^"]*)" and "([^"]*)"$/ do |row, col1, col2|
+Then /^the data for row "([^\"]*)" should be "([^\"]*)" and "([^\"]*)"$/ do |row, col1, col2|
   table_row = @element[row.to_i - 1]
   table_row[0].text.should == col1
   table_row[1].text.should == col2
@@ -17,10 +17,20 @@ When /^I retrieve a table element by "([^\"]*)"$/ do |how|
   @element = @page.send "table_#{how}_element"
 end
 
-When /^I retrieve a table element by "([^"]*)" and "([^"]*)"$/ do |param1, param2|
+When /^I retrieve a table element by "([^\"]*)" and "([^\"]*)"$/ do |param1, param2|
   @element = @page.send "table_#{param1}_#{param2}_element"
 end
 
 When /^I retrieve a table element while the script is executing$/ do
   @element = @page.table_element(:id => 'table_id')
 end
+
+Then /^the data for the first row should be "([^\"]*)" and "([^\"]*)"$/ do |col1, col2|
+  @element.first_row[0].text.should == col1
+  @element.first_row[1].text.should == col2
+end
+
+Then /^the data for the last row should be "([^\"]*)" and "([^\"]*)"$/ do |col1, col2|
+  @element.last_row[0].text.should == col1
+  @element.last_row[1].text.should == col2
+end

data/features/support/page.rb

@@ -125,6 +125,10 @@ class Page
   button(:button_class_index, :class => "button_class", :index => 0)
   button(:button_name_index, :name => "button_name", :index => 0)
 
+  button(:button_image_id, :id => 'button_image_id')
+  button(:button_image_src, :src => 'images/submit.gif')
+  button(:button_image_alt, :alt => 'Submit')
+
   button(:btn_id, :id => 'btn_id')
   button(:btn_name, :name => 'btn_name')
   button(:btn_class, :class => 'btn_class')
@@ -134,6 +138,8 @@ class Page
   button(:btn_class_index, :class => "btn_class", :index => 0)
   button(:btn_name_index, :name => "btn_name", :index => 0)
 
+  button(:disabled_button, :value => 'Disabled')
+
   image(:image_id, :id => 'image_id')
   image(:image_name, :name => 'image_name')
   image(:image_class, :class => 'image_class')

data/features/table.feature

@@ -23,6 +23,8 @@ Feature: Table
     And each row should contain "Data"
     And row "1" should have "2" columns
     And each column should contain "Data"
+    And the data for the first row should be "Data1" and "Data2"
+    And the data for the last row should be "Data3" and "Data4"
 
   Scenario Outline: Locating table cells on the Page
     When I retrieve a table element by "<search_by>"

data/lib/page-object/accessors.rb

@@ -323,6 +323,8 @@ module PageObject
     #   * :text => Watir and Selenium
     #   * :value => Watir and Selenium
     #   * :xpath => Watir and Selenium
+    #   * :src => Watir and Selenium (input type=image only)
+    #   * :alt => Watir and Selenium (input type=image only)
     # @param optional block to be invoked when element method is called
     #
     def button(name, identifier=nil, &block)

data/lib/page-object/elements/button.rb

@@ -11,11 +11,11 @@ module PageObject
       protected
 
       def self.watir_finders
-        super + [:text, :value]
+        super + [:text, :value, :src, :alt]
       end
 
       def self.selenium_finders
-        super + [:value]
+        super + [:value, :src, :alt]
       end
 
       def include_platform_for platform

data/lib/page-object/elements/table.rb

@@ -20,6 +20,24 @@ module PageObject
         end
       end
 
+      #
+      # return the first row
+      #
+      # @return PageObject::Elements::TableRow
+      #
+      def first_row
+        self[0]
+      end
+
+      #
+      # return the last row
+      #
+      # @return PageObject::Elements::TableRow
+      #
+      def last_row
+        self[-1]
+      end
+
       protected
 
       def child_xpath

data/lib/page-object/platforms/selenium_webdriver/page_object.rb

@@ -462,6 +462,7 @@ module PageObject
         #
         def click_button_for(identifier)
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Button, 'input', :type => 'submit')
+          puts "how=#{how}, what=#{what}"
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click
           @browser.switch_to.default_content unless frame_identifiers.nil?
@@ -781,6 +782,8 @@ module PageObject
           return false if identifier[:href] and tag == 'a'
           return false if identifier[:text] and ['div', 'span', 'td'].include? tag
           return false if identifier[:value] and tag == 'input' and additional[:type] == 'submit'
+          return false if identifier[:src] and tag == 'input' and additional[:type] == 'submit'
+          return false if identifier[:alt] and tag == 'input' and additional[:type] == 'submit'
           return false if identifier[:value] and tag == 'input' and additional[:type] == 'radio'
           true
         end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/page-object.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'watir-webdriver', '>= 0.3.9'
-  s.add_dependency 'selenium-webdriver', '>= 2.12.2' 
+  s.add_dependency 'selenium-webdriver', '>= 2.14.0' 
   
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '>= 1.1.0'

data/spec/page-object/elements/button_spec.rb

@@ -6,14 +6,14 @@ describe PageObject::Elements::Button do
 
   context "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :id, :index, :name, :value, :xpath].each do |t|
+      [:class, :id, :index, :name, :value, :xpath, :src, :alt].each do |t|
         identifier = button.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :index, :name, :value, :xpath].each do |t|
+      [:class, :id, :index, :name, :value, :xpath, :src, :alt].each do |t|
         key, value = button.selenium_identifier_for t => 'value'
         key.should == t
       end
@@ -31,4 +31,4 @@ describe PageObject::Elements::Button do
     end
   end
 
-end
+end

data/spec/page-object/elements/table_spec.rb

@@ -34,6 +34,16 @@ describe PageObject::Elements::Table do
         watir_table[1].should be_instance_of PageObject::Elements::TableRow
       end
 
+      it "should return the first row" do
+        table_element.stub(:[]).with(0).and_return(table_element)
+        watir_table.first_row.should be_instance_of PageObject::Elements::TableRow
+      end
+
+      it "shoudl return the last row" do
+        table_element.stub(:[]).with(-1).and_return(table_element)
+        watir_table.last_row.should be_instance_of PageObject::Elements::TableRow
+      end
+
       it "should return the number of rows" do
         table_element.stub(:wd).and_return(table_element)
         table_element.should_receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
@@ -57,6 +67,16 @@ describe PageObject::Elements::Table do
         selenium_table[1].should be_instance_of PageObject::Elements::TableRow
       end
 
+      it "should return the first row" do
+        table_element.stub(:[]).with(0).and_return(table_element)
+        selenium_table.first_row.should be_instance_of PageObject::Elements::TableRow
+      end
+
+      it "shoudl return the last row" do
+        table_element.stub(:[]).with(-1).and_return(table_element)
+        selenium_table.last_row.should be_instance_of PageObject::Elements::TableRow
+      end
+
       it "should return the number of rows" do
         table_element.should_receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
         table_element.should_receive(:size).and_return(2)
@@ -71,4 +91,4 @@ describe PageObject::Elements::Table do
       end
     end
   end
-end
+end

metadata

@@ -1,82 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: page-object
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.2
   prerelease: 
-  version: 0.5.1
 platform: ruby
-authors: 
+authors:
 - Jeff Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: watir-webdriver
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70095900630940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.9
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: selenium-webdriver
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70095900630940
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: &70095900629300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.12.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.14.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70095900629300
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70095900627260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70095900627260
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70095900626440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70095900626440
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70095900625280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70095900625280
 description: Page Object DSL that works with both Watir and Selenium
-email: 
+email:
 - jeff.morgan@leandog.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -102,6 +98,7 @@ files:
 - features/html/frames.html
 - features/html/iframes.html
 - features/html/images/circle.png
+- features/html/images/submit.gif
 - features/html/modal.html
 - features/html/modal_1.html
 - features/html/modal_2.html
@@ -254,32 +251,29 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/cheezy/page-object
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: page-object
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Page Object DSL for browser testing
-test_files: 
+test_files:
 - features/async.feature
 - features/button.feature
 - features/check_box.feature
@@ -295,6 +289,7 @@ test_files:
 - features/html/frames.html
 - features/html/iframes.html
 - features/html/images/circle.png
+- features/html/images/submit.gif
 - features/html/modal.html
 - features/html/modal_1.html
 - features/html/modal_2.html