RubyGems - page-object - Versions diffs - 0.6.8 → 0.6.9 - Mend

page-object 0.6.8 → 0.6.9

Files changed (26) hide show

data/ChangeLog +10 -0
data/features/div.feature +1 -0
data/features/html/static_elements.html +3 -2
data/features/label.feature +1 -0
data/features/link.feature +1 -0
data/features/select_list.feature +4 -0
data/features/step_definitions/select_list_steps.rb +4 -0
data/features/support/page.rb +5 -2
data/features/text_field.feature +2 -0
data/lib/page-object/accessors.rb +4 -1
data/lib/page-object/elements/div.rb +2 -2
data/lib/page-object/elements/link.rb +2 -2
data/lib/page-object/elements/text_field.rb +2 -2
data/lib/page-object/javascript/yui.rb +19 -0
data/lib/page-object/javascript_framework_facade.rb +2 -0
data/lib/page-object/page_populator.rb +1 -0
data/lib/page-object/platforms/selenium_webdriver/page_object.rb +4 -0
data/lib/page-object/platforms/selenium_webdriver/select_list.rb +11 -0
data/lib/page-object/platforms/watir_webdriver/select_list.rb +8 -0
data/lib/page-object/version.rb +1 -1
data/page-object.gemspec +1 -1
data/spec/page-object/elements/div_spec.rb +2 -2
data/spec/page-object/elements/link_spec.rb +2 -2
data/spec/page-object/elements/text_field_spec.rb +2 -2
data/spec/page-object/page_populator_spec.rb +8 -4
metadata +16 -15

data/ChangeLog CHANGED

@@ -1,3 +1,13 @@
+=== Version 0.6.9 / 2012-6-12
+* Enhancements
+  * Added select_value method to SelectList
+  * Updated link to be able to identify by title
+  * Updated div to be able to identify by title
+  * Updated text_field to be able to identify by text and label
+  * Updated to use selenium-webdriver 2.22.2
+* Fixes
+  * Fixed populate_page_with to work with text areas (Thanks ramyav85)
 === Version 0.6.8 / 2012-6-3
 * Enhancements
   * Updated [] method on Table to return nil when bad row header is provided

data/features/div.feature CHANGED

@@ -27,6 +27,7 @@ Feature: Div
     | index     |
     | name      |
     | text      |
+    | title     |
   Scenario Outline: Locating divs using multiple parameters
     When I search for the div by "<param1>" and "<param2>"

data/features/html/static_elements.html CHANGED

@@ -5,6 +5,7 @@
   <body>
     <p id='p_id' name='p_name' class='p_class'>Static Elements Page</p>
+    <label for="text_field_id">Text Field</label>
     <input id="text_field_id" name="text_field_name" class="text_field_class"
            title="text_field_title" size="40" type="text"/>
@@ -24,14 +25,14 @@
       <option value="option3" selected="true">Test 3</option>
     </select>
-    <a href="success.html" id="link_id" name="link_name" class="link_class">Google Search</a>
+    <a href="success.html" id="link_id" name="link_name" class="link_class" title="link_title">Google Search</a>
     <input id="cb_id" name="cb_name" class="cb_class" type="checkbox" value="1"/>
     <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
-    <div id="div_id" name="div_name" class="div_class">
+    <div id="div_id" name="div_name" class="div_class" title="div_title">
         page-object rocks!
     </div>

data/features/label.feature CHANGED

@@ -42,3 +42,4 @@ Feature: Handling labels with page object
     When I get the text from a label while the script is executing
     Then I should see that the label exists
     And the text should be "page-object is the best!"

data/features/link.feature CHANGED

@@ -25,6 +25,7 @@ Feature: Links
     | index     |
     | href      |
     | css       |
+    | title     |
   Scenario: Support for multiple parameters
     When I select a link labeled "Hello" and index "0"

data/features/select_list.feature CHANGED

@@ -60,3 +60,7 @@ Feature: Select List
   Scenario: Clearing multiple select list
     When I clear multiple select list
     Then multiple select list should have no selected options
+  Scenario: Selecting an option by its value
+    When I select an option using the value "option2"
+    Then the selected option should be "Test 2"

data/features/step_definitions/select_list_steps.rb CHANGED

@@ -55,3 +55,7 @@ end
 Then /^multiple select list should have no selected options$/ do
   @page.sel_list_multiple_element.selected_options.should be_empty
 end
+When /^I select an option using the value "([^\"]*)"$/ do |value|
+  @page.sel_list_id_element.select_value(value)
+end

data/features/support/page.rb CHANGED

@@ -17,6 +17,7 @@ class Page
   text_field(:text_field_index, :index => 0)
   text_field(:text_field_text, :text => "")
   text_field(:text_field_value, :value => "")
+  text_field(:text_field_label, :label => "Text Field")
   text_field(:text_field_title, :title => 'text_field_title')
   text_field(:text_field_class_index, :class => "text_field_class", :index => 0)
   text_field(:text_field_name_index, :name => "text_field_name", :index => 0)
@@ -55,6 +56,7 @@ class Page
   link(:google_search_text, :text => "Google Search")
   link(:google_search_index, :index => 0)
   link(:google_search_css, :css => "a.link_class")
+  link(:google_search_title, :title => "link_title")
   select_list(:sel_list_id, :id => "sel_list_id")
   select_list(:sel_list_class, :class => "sel_list_class")
@@ -93,6 +95,7 @@ class Page
   div(:div_text, :text => 'page-object rocks!')
   div(:div_index, :index => 0)
   div(:div_xpath, :xpath => '//div')
+  div(:div_title, :title => 'div_title')
   div(:div_class_index, :class => "div_class", :index => 0)
   div(:div_name_index, :name => "div_name", :index => 0)
@@ -265,8 +268,8 @@ class Page
   label(:label_name, :name => 'label_name')
   label(:label_class, :class => 'label_class')
   label(:label_text, :text => 'page-object is the best!')
-  label(:label_index, :index => 0)
-  label(:label_xpath, :xpath => '//label')
+  label(:label_index, :index => 1)
+  label(:label_xpath, :xpath => '//label[2]')
   label(:label_class_index, :class => "label_class", :index => 0)
   label(:label_name_index, :name => "label_name", :index => 0)

data/features/text_field.feature CHANGED

@@ -22,6 +22,8 @@ Feature: Text Fields
     | xpath     |
     | index     |
     | title     |
+    | text      |
+    | label     |
   Scenario Outline: Locating a text field using multiple parameters
     When I search for the text field by "<param1>" and "<param2>"

data/lib/page-object/accessors.rb CHANGED

@@ -99,8 +99,9 @@ module PageObject
     #   * :class => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
+    #   * :label => Watir and Selenium
     #   * :name => Watir and Selenium
-    #   * :text => Watir only
+    #   * :text => Watir and Selenium
     #   * :title => Watir and Selenium
     #   * :value => Watir only
     #   * :xpath => Watir and Selenium
@@ -266,6 +267,7 @@ module PageObject
     #   * :link_text => Watir and Selenium
     #   * :name => Watir and Selenium
     #   * :text => Watir and Selenium
+    #   * :title => Watir and Selenium
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
@@ -433,6 +435,7 @@ module PageObject
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
     #   * :text => Watir and Selenium
+    #   * :title => Watir and Selenium
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #

data/lib/page-object/elements/div.rb CHANGED

@@ -5,11 +5,11 @@ module PageObject
       protected
       def self.watir_finders
-        [:class, :id, :name, :text, :index, :xpath]
+        super + [:text, :title]
       end
       def self.selenium_finders
-        [:class, :id, :name, :text, :xpath, :index]
+        super + [:text, :title]
       end
     end

data/lib/page-object/elements/link.rb CHANGED

@@ -11,7 +11,7 @@ module PageObject
       protected
       def self.watir_finders
-        super + [:href, :text, :css]
+        super + [:href, :text, :css, :title]
       end
       def self.watir_mapping
@@ -19,7 +19,7 @@ module PageObject
       end
       def self.selenium_finders
-        super + [:link, :link_text, :css]
+        super + [:link, :link_text, :css, :title]
       end
       def self.selenium_mapping

data/lib/page-object/elements/text_field.rb CHANGED

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

data/lib/page-object/javascript/yui.rb ADDED

@@ -0,0 +1,19 @@
+module PageObject
+  module Javascript
+    module YUI
+      #
+      # return the number of pending ajax requests
+      #
+      def self.pending_requests
+         "var inProgress=0
+         for(var i=0; i < YAHOO.util.Connect._transaction_id; i++) {
+           if(YAHOO.util.Connect.isCallInProgress(i))
+             inProgress++;
+         }
+         return inProgress;"
+      end
+    end
+  end
+end

data/lib/page-object/javascript_framework_facade.rb CHANGED

@@ -1,5 +1,6 @@
 require 'page-object/javascript/jquery'
 require 'page-object/javascript/prototype'
+require 'page-object/javascript/yui'
 module PageObject
@@ -61,6 +62,7 @@ module PageObject
         @builder = {
           :jquery => ::PageObject::Javascript::JQuery,
           :prototype => ::PageObject::Javascript::Prototype,
+          :yui => ::PageObject::Javascript::YUI,
         }
       end

data/lib/page-object/page_populator.rb CHANGED

@@ -66,6 +66,7 @@ module PageObject
     end
     def is_enabled?(key)
+      return true if (self.send "#{key}_element").tag_name == "textarea"
       self.send("#{key}_element").enabled?
     end
   end

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

@@ -949,11 +949,15 @@ module PageObject
           return false if identifier[:src] and tag == 'input' and
             ['submit', 'image', 'button', 'reset'].include? additional[:type]
           return false if identifier[:src] and tag == 'img'
+          return false if identifier[:label]
           return false if identifier[:text] and tag == 'input' and additional[:type] == 'hidden'
+          return false if identifier[:text] and tag == 'input' and additional[:type] == 'text'
           return false if identifier[:text] and ['div', 'span', 'td', 'label'].include? tag
           return false if identifier[:title] and tag == 'input' and additional[:type] == 'text'
           return false if identifier[:title] and tag == 'input' and additional[:type] == 'file'
+          return false if identifier[:title] and tag == 'a'
           return false if identifier[:title] and tag == 'span'
+          return false if identifier[:title] and tag == 'div'
           return false if identifier[:value] and tag == 'input' and
             ['radio', 'submit', 'image', 'button', 'reset', 'checkbox', 'hidden'].include? additional[:type]
           true

data/lib/page-object/platforms/selenium_webdriver/select_list.rb CHANGED

@@ -22,6 +22,17 @@ module PageObject
           end.click
         end
+        #
+        # Select the option(s) whose value attribute matches the given
+        # string
+        #
+        def select_value(value)
+          options = find_options.find_all do |option|
+            option.attribute('value') == value
+          end
+          options.each {|opt| opt.click}
+        end
         #
         # Return an array of Options contained in the select lit.
         #

data/lib/page-object/platforms/watir_webdriver/select_list.rb CHANGED

@@ -20,6 +20,14 @@ module PageObject
           element.select(value)
         end
+        #
+        # Select the option(s) whose value attribute matches the given
+        # string
+        #
+        def select_value(value)
+          element.select_value(value)
+        end
         #
         # Return an array of Options contained in the select lit.
         #

data/lib/page-object/version.rb CHANGED

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

data/page-object.gemspec CHANGED

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency 'watir-webdriver', '>= 0.6.1'
-  s.add_dependency 'selenium-webdriver', '>= 2.22.1'
+  s.add_dependency 'selenium-webdriver', '>= 2.22.2'
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '< 1.2.0'

data/spec/page-object/elements/div_spec.rb CHANGED

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

data/spec/page-object/elements/link_spec.rb CHANGED

@@ -6,7 +6,7 @@ describe PageObject::Elements::Link do
   describe "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :href, :id, :index, :name, :text, :xpath, :css].each do |t|
+      [:class, :href, :id, :index, :name, :text, :xpath, :css, :title].each do |t|
         identifier = link.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
@@ -20,7 +20,7 @@ describe PageObject::Elements::Link do
     end
     it "should map selenium types to same" do
-      [:class, :id, :link, :link_text, :name, :xpath, :index, :css].each do |t|
+      [:class, :id, :link, :link_text, :name, :xpath, :index, :css, :title].each do |t|
         key, value = link.selenium_identifier_for t => 'value'
         key.should == t
       end

data/spec/page-object/elements/text_field_spec.rb CHANGED

@@ -7,14 +7,14 @@ describe PageObject::Elements::TextField do
     let(:textfield) { PageObject::Elements::TextField }
     it "should map watir types to same" do
-      [:class, :id, :index, :name, :title, :xpath].each do |t|
+      [:class, :id, :index, :name, :title, :xpath, :text, :label].each do |t|
         identifier = textfield.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
     end
     it "should map selenium types to same" do
-      [:class, :id, :name, :title, :xpath, :index].each do |t|
+      [:class, :id, :name, :title, :xpath, :index, :text, :label].each do |t|
         key, value = textfield.selenium_identifier_for t => 'value'
         key.should == t
       end

data/spec/page-object/page_populator_spec.rb CHANGED

@@ -28,14 +28,16 @@ describe PageObject::PagePopulator  do
   it "should not populate a text field when it is disabled" do
     page_object.should_not_receive(:tf=)
-    page_object.should_receive(:tf_element).and_return(browser)
+    page_object.should_receive(:tf_element).twice.and_return(browser)
     browser.should_receive(:enabled?).and_return(false)
+    browser.should_receive(:tag_name).and_return('input')
     page_object.populate_page_with('tf' => true)
   end
   it "should set a value in a text area" do
     page_object.should_receive(:ta=).with('value')
-    page_object.stub(:is_enabled?).and_return(true)
+    page_object.should_receive(:ta_element).and_return(browser)
+    browser.should_receive(:tag_name).and_return('textarea')
     page_object.populate_page_with('ta' => 'value')
   end
@@ -77,15 +79,17 @@ describe PageObject::PagePopulator  do
   it "should not populate a checkbox if it is disabled" do
     page_object.should_not_receive(:check_cb)
-    page_object.should_receive(:cb_element).and_return(browser)
+    page_object.should_receive(:cb_element).twice.and_return(browser)
     browser.should_receive(:enabled?).and_return(false)
+    browser.should_receive(:tag_name).and_return('input')
     page_object.populate_page_with('cb' => true)
   end
   it "should not populate a radio button when it is disabled" do
     page_object.should_not_receive(:select_rb)
-    page_object.should_receive(:rb_element).and_return(browser)
+    page_object.should_receive(:rb_element).twice.and_return(browser)
     browser.should_receive(:enabled?).and_return(false)
+    browser.should_receive(:tag_name).and_return('input')
     page_object.populate_page_with('rb' => true)
   end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-06-03 00:00:00.000000000 Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70276232212840 !ruby/object:Gem::Requirement
+  requirement: &70157117515820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70276232212840
+  version_requirements: *70157117515820
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70276232228720 !ruby/object:Gem::Requirement
+  requirement: &70157117515320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.22.1
+        version: 2.22.2
   type: :runtime
   prerelease: false
-  version_requirements: *70276232228720
+  version_requirements: *70157117515320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70276232228260 !ruby/object:Gem::Requirement
+  requirement: &70157117514860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70276232228260
+  version_requirements: *70157117514860
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70276232227800 !ruby/object:Gem::Requirement
+  requirement: &70157117514400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70276232227800
+  version_requirements: *70157117514400
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70276232227340 !ruby/object:Gem::Requirement
+  requirement: &70157117513940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70276232227340
+  version_requirements: *70157117513940
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70276232226880 !ruby/object:Gem::Requirement
+  requirement: &70157117513480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70276232226880
+  version_requirements: *70157117513480
 description: Page Object DSL that works with both Watir and Selenium
 email:
 - jeff.morgan@leandog.com
@@ -218,6 +218,7 @@ files:
 - lib/page-object/elements/unordered_list.rb
 - lib/page-object/javascript/jquery.rb
 - lib/page-object/javascript/prototype.rb
+- lib/page-object/javascript/yui.rb
 - lib/page-object/javascript_framework_facade.rb
 - lib/page-object/loads_platform.rb
 - lib/page-object/nested_elements.rb