page-object 0.8.6 → 0.8.6.1

data/ChangeLog

@@ -1,3 +1,9 @@
+=== Version 0.8.6.1 / 2013-3-4
+* Enhancements
+  * Added lable locators for checkbox, text area, select list, radio button and file field (Thanks Alex Rodionov)
+  * Updated to use the latest selenium-webdriver 2.31.0
+  * Updated to use the latest page_navigation 0.7
+
 === Version 0.8.6 / 2013-2-27
 * Enhancements
   * Added support for the svg element

data/features/check_box.feature

@@ -24,6 +24,7 @@ Feature: Check Box
     | xpath     |
     | index     |
     | value     |
+    | label     |
 
   @selenium_only
   Scenario Outline: Locating check boxes on the page
@@ -47,7 +48,7 @@ Feature: Check Box
     When I retrieve a check box element
     Then I should know it exists
     And I should know it is visible
-      
+
   Scenario: Finding a check box dynamically
     When I select the first check box while the script is executing
     Then I should see that the checkbox exists

data/features/file_field.feature

@@ -19,6 +19,7 @@ Feature: File Field
     | xpath     |
     | title     |
     | index     |
+    | label     |
 
   @selenium_only
   Scenario Outline: Locating file fields on the Page

data/features/html/static_elements.html

@@ -12,8 +12,10 @@
     <input id="hidden_field_id" name="hidden_field_name" class="hidden_field_class"
            size="40" type="hidden" value="12345"/>
 
+    <label for="text_area_id">Text Area</label>
     <textarea rows="2" cols="20" id="text_area_id" class="text_area_class" name="text_area_name"></textarea>
 
+    <label for="sel_list_id">Select List</label>
     <select name="sel_list_name" id="sel_list_id" class="sel_list_class">
       <option value="option1">Test 1</option>
       <option value="option2">Test 2</option>
@@ -31,7 +33,7 @@
       <area shape="circle" coords="90,58,3" href="mercur.html"/>
       <area shape="circle" coords="124,58,8" href="venus.html"/>
     </map>
-    
+
     <canvas id="canvas" name="canvas" class="canvas" width="200" height="100"></canvas>
     <script type="text/javascript">
       var c=document.getElementById("myCanvas");
@@ -53,15 +55,17 @@
       <source src="movie.ogg" type="video/ogg" />
       Your browser does not support the video tag.
     </video>
-    
+
     <svg width="100" height="100" id="the_svg">
       <circle cx="50" cy="50" r="40" fill="red" stroke="blue" stroke-width="5" />
-    </svg>    
+    </svg>
 
     <a href="success.html" id="link_id" name="link_name" class="link_class" title="link_title">Google Search</a>
 
+    <label for="cb_id">Checkbox</label>
     <input id="cb_id" name="cb_name" class="cb_class" type="checkbox" value="1"/>
 
+    <label for="milk_id">Radio</label>
     <input type="radio" id="milk_id" name="milk_name" class="milk_class" value="Milk"> Milk <br/>
     <input type="radio" id="butter_id" name="butter_name" class="butter_class" value="Butter">Butter
 
@@ -122,6 +126,7 @@
     <form id="form_id" class="form_class" name="form_name" action="/">
     </form>
 
+    <label for="file_field_id">File Field</label>
     <input type="file" name="file_field_name" id="file_field_id" class="file_field_class" title="file_field_title" />
 
     <ul id="ul_id" name="ul_name" class="ul_class">

data/features/radio_button.feature

@@ -25,6 +25,7 @@ Feature: Radio Buttons
     | xpath     |
     | value     |
     | index     |
+    | label     |
 
   @selenium_only
   Scenario Outline: Locating radio buttons on the Page

data/features/select_list.feature

@@ -23,6 +23,7 @@ Feature: Select List
     | name      |
     | xpath     |
     | index     |
+    | label     |
 
   @selenium_only
   Scenario Outline: Locating select lists on the Page using Selenium
@@ -75,7 +76,7 @@ Feature: Select List
   Scenario: Selecting an option by its value
     When I select an option using the value "option2"
     Then the selected option should be "Test 2"
-    
+
   Scenario: Getting the value from a selected option
     When I select an option using the value "option2"
     Then the selected option should have a value of "option2"

data/features/support/page.rb

@@ -34,6 +34,7 @@ class Page
   text_area(:text_area_value, :value => "")
   text_area(:text_area_class_index, :class => "text_area_class", :index => 0)
   text_area(:text_area_name_index, :name => "text_area_name", :index => 0)
+  text_area(:text_area_label, :label => "Text Area")
 
   hidden_field(:hidden_field_id, :id => "hidden_field_id")
   hidden_field(:hidden_field_class, :class => "hidden_field_class")
@@ -72,6 +73,7 @@ class Page
   select_list(:sel_list_class_index, :class => "sel_list_class", :index => 0)
   select_list(:sel_list_name_index, :name => "sel_list_name", :index => 0)
   select_list(:sel_list_multiple, :id => "sel_list_multiple")
+  select_list(:sel_list_label, :label => "Select List")
 
   checkbox(:cb_id, :id => 'cb_id')
   checkbox(:cb_name, :name => 'cb_name')
@@ -82,6 +84,7 @@ class Page
   checkbox(:cb_value, :value => '1')
   checkbox(:cb_class_index, :class => "cb_class", :index => 0)
   checkbox(:cb_name_index, :name => "cb_name", :index => 0)
+  checkbox(:cb_label, :label => 'Checkbox')
 
   radio_button(:milk_id, :id => 'milk_id')
   radio_button(:milk_name, :name => 'milk_name')
@@ -92,6 +95,7 @@ class Page
   radio_button(:milk_xpath, :xpath => "//input[@type='radio']")
   radio_button(:milk_class_index, :class => "milk_class", :index => 0)
   radio_button(:milk_name_index, :name => "milk_name", :index => 0)
+  radio_button(:milk_label, :label => "Radio")
 
   radio_button(:butter_id, :id => 'butter_id')
 
@@ -164,7 +168,7 @@ 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')
@@ -294,14 +298,15 @@ class Page
   file_field(:file_field_class_index, :class => 'file_field_class', :index => 0)
   file_field(:file_field_name_index, :name => 'file_field_name', :index => 0)
   file_field(:file_field_xpath, :xpath => "//input[@type='file']")
+  file_field(:file_field_label, :label => "File Field")
 
   label(:label_id, :id => 'label_id')
   label(:label_name, :name => 'label_name')
   label(:label_class, :class => 'label_class')
   label(:label_css, :css => '.label_class')
   label(:label_text, :text => 'page-object is the best!')
-  label(:label_index, :index => 1)
-  label(:label_xpath, :xpath => '//label[2]')
+  label(:label_index, :index => 5)
+  label(:label_xpath, :xpath => '//label[6]')
   label(:label_class_index, :class => "label_class", :index => 0)
   label(:label_name_index, :name => "label_name", :index => 0)
 
@@ -344,7 +349,7 @@ class Page
   video(:video_xpath, :xpath => '//video')
   video(:video_class_index, :class => 'video', :index => 0)
   video(:video_name_index, :name => 'video', :index => 0)
-  
+
   element(:article_id, :article, :id => 'article_id')
   element(:header_id, :header, :id => 'header_id')
   element(:footer_id, :footer, :id => 'footer_id')

data/features/text_area.feature

@@ -19,6 +19,7 @@ Feature: Text Area
     | name      |
     | xpath     |
     | index     |
+    | label     |
 
   @selenium_only
   Scenario Outline: Locating text area on the Page
@@ -42,7 +43,7 @@ Feature: Text Area
     When I find a text area while the script is executing
     Then I should see that the text area exists
     And I should be able to type "I found it" into the area element
-    
+
   Scenario: Clearing the text area
     When I type "abcdefghijklmnop" into the text area
     Then the text area should contain "abcdefghijklmnop"

data/lib/page-object/accessors.rb

@@ -194,6 +194,7 @@ module PageObject
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
     #   * :xpath => Watir and Selenium
+    #   * :label => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
     def text_area(name, identifier={:index => 0}, &block)
@@ -231,6 +232,7 @@ module PageObject
     #   * :text => Watir only
     #   * :value => Watir only
     #   * :xpath => Watir and Selenium
+    #   * :label => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
     def select_list(name, identifier={:index => 0}, &block)
@@ -242,12 +244,12 @@ module PageObject
         return platform.select_list_value_set(identifier.clone, value) unless block_given?
         self.send("#{name}_element").select(value)
       end
-      
+
       define_method("#{name}_options") do
         element = self.send("#{name}_element")
         (element && element.options) ? element.options.collect(&:text) : []
       end
-      
+
       standard_methods(name, identifier, 'select_list_for', &block)
     end
     alias_method :select, :select_list
@@ -307,6 +309,7 @@ module PageObject
     #   * :name => Watir and Selenium
     #   * :value => Watir and Selenium
     #   * :xpath => Watir and Selenium
+    #   * :label => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
     def checkbox(name, identifier={:index => 0}, &block)
@@ -347,6 +350,7 @@ module PageObject
     #   * :name => Watir and Selenium
     #   * :value => Watir and Selenium
     #   * :xpath => Watir and Selenium
+    #   * :label => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
     def radio_button(name, identifier={:index => 0}, &block)
@@ -859,6 +863,7 @@ module PageObject
     #   * :name => Watir and Selenium
     #   * :title => Watir and Selenium
     #   * :xpath => Watir and Selenium
+    #   * :label => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
     def file_field(name, identifier={:index => 0}, &block)
@@ -1118,7 +1123,7 @@ module PageObject
         platform.send(method, identifier.clone).exists?
       end
     end
-    
+
     #
     # adds a method that will return an indexed property.  The property will respond to
     # the [] method with an object that has a set of normal page_object properties that

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

@@ -11,13 +11,13 @@ module PageObject
       protected
 
       def self.watir_finders
-        super + [:value]
+        super + [:value, :label]
       end
 
       def self.selenium_finders
-        super + [:value]
+        super + [:value, :label]
       end
-      
+
       def include_platform_for platform
         super
         if platform[:platform] == :watir_webdriver
@@ -33,6 +33,6 @@ module PageObject
     end
 
     ::PageObject::Elements.type_to_class[:checkbox] = ::PageObject::Elements::CheckBox
-    
+
   end
 end

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

@@ -11,11 +11,11 @@ module PageObject
       protected
 
       def self.watir_finders
-        super + [:title]
+        super + [:title, :label]
       end
 
       def self.selenium_finders
-        super + [:title]
+        super + [:title, :label]
       end
 
       def include_platform_for platform
@@ -33,6 +33,6 @@ module PageObject
     end
 
     ::PageObject::Elements.type_to_class[:file] = ::PageObject::Elements::FileField
-    
+
   end
 end

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

@@ -9,13 +9,13 @@ module PageObject
       end
 
       protected
-      
+
       def self.watir_finders
-        super + [:value]
+        super + [:value, :label]
       end
 
       def self.selenium_finders
-        super + [:value]
+        super + [:value, :label]
       end
 
       def include_platform_for platform

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

@@ -15,7 +15,11 @@ module PageObject
       end
 
       def self.watir_finders
-        super + [:text, :value]
+        super + [:text, :value, :label]
+      end
+
+      def self.selenium_finders
+        super + [:label]
       end
 
       def include_platform_for platform

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

@@ -8,6 +8,14 @@ module PageObject
         include_platform_for platform
       end
 
+      def self.watir_finders
+        super + [:label]
+      end
+
+      def self.selenium_finders
+        super + [:label]
+      end
+
       protected
 
       def include_platform_for platform
@@ -25,6 +33,6 @@ module PageObject
     end
 
     ::PageObject::Elements.tag_to_class[:textarea] = ::PageObject::Elements::TextArea
-    
+
   end
 end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.8.6"
+  VERSION = "0.8.6.1"
 end

data/page-object.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'watir-webdriver', '>= 0.6.2'
-  s.add_dependency 'selenium-webdriver', '>= 2.30.0'
-  s.add_dependency 'page_navigation', '>= 0.6'
+  s.add_dependency 'selenium-webdriver', '>= 2.31.0'
+  s.add_dependency 'page_navigation', '>= 0.7'
 
   s.add_development_dependency 'rspec', '>= 2.12.0'
   s.add_development_dependency 'cucumber', '>= 1.2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.30.0
+        version: 2.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.30.0
+        version: 2.31.0
 - !ruby/object:Gem::Dependency
   name: page_navigation
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -397,7 +397,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3437791365044287985
+      hash: -3618405462475899923
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -406,7 +406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3437791365044287985
+      hash: -3618405462475899923
 requirements: []
 rubyforge_project: page-object
 rubygems_version: 1.8.25