page-object 0.1 → 0.1.1

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2
+rvm 1.9.2-p290@page-object

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+    - 1.9.2

data/ChangeLog

@@ -1,3 +1,10 @@
+=== Version 0.1.1
+* Enhancements
+  * Support for identifying hidden fields by text when using Selenium
+  * Support for identifying links by href when using Selenium
+  * Updated to use selenium-webdriver 2.0.1
+  * Updated to use watir-webdriver 0.2.6
+
 === Version 0.1 / 2011-07-01
 * Enhancements
   * Support for using multiple identifiers when locating the following element:

data/cucumber.yml

@@ -3,5 +3,5 @@ watir: DRIVER=WATIR --no-source --color --format pretty --tags ~@selenium_only
 selenium: DRIVER=SELENIUM --no-source --color --format pretty --tags ~@watir_only
 watir_focus: DRIVER=WATIR --no-source --color --format pretty --tags @focus --tags ~@selenium_only
 selenium_focus: DRIVER=SELENIUM --no-source --color --format pretty --tags @focus --tags ~@watir_only
-autotest: DRIVER=WATIR --no-source --color --format pretty --tags ~@selenium_only
+autotest: DRIVER=SELENIUM features/hidden_field.feature --no-source --color --format pretty --tags ~@watir_only
 

data/features/hidden_field.feature

@@ -20,14 +20,6 @@ Feature: Hidden Fields
     | css       |
     | tag_name  |
     | index     |
-
-  @watir_only
-  Scenario Outline: Locating hidden fields on Watir only
-    When I search for the hidden field by "<search_by>"
-    Then hidden field element should contains "12345"
-
-  Scenarios:
-    | search_by |
     | text      |
 
   Scenario Outline: Locating a hidden field using multiple parameters

data/features/link.feature

@@ -23,16 +23,8 @@ Feature: Links
     | link_text |
     | text      |
     | index     |
-
-  @watir_only
-  Scenario Outline: Locating links on Watir only
-    When I search for the link by "<search_by>"
-    Then I should be able to select the link
-  
-  Scenarios:
-    | search_by |
     | href      |
-    
+
   Scenario: Support for multiple parameters
     When I select a link labeled "Hello" and index "0"
     Then the page should contain the text "Success"

data/lib/page-object/accessors.rb

@@ -74,7 +74,7 @@ module PageObject
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
     #   * :tag_name => Watir and Selenium
-    #   * :text => Watir only
+    #   * :text => Watir and Selenium
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
@@ -166,7 +166,7 @@ module PageObject
     # @param [Hash] identifier how we find a link.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :href => Watir only
+    #   * :href => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :link => Watir and Selenium

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

@@ -31,10 +31,6 @@ module PageObject
         all_identities
       end
       
-      def self.should_build_watir_xpath identifier
-        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol'].include? identifier[:tag_name] and identifier[:name]
-      end
-
       # @private
       def self.selenium_identifier_for identifier
         if identifier.length == 1
@@ -49,6 +45,10 @@ module PageObject
 
       protected
       
+      def self.should_build_watir_xpath identifier
+        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol'].include? identifier[:tag_name] and identifier[:name]
+      end
+
       def self.build_xpath_for identifier
         tag_locator = identifier.delete(:tag_name)
         idx = identifier.delete(:index)

data/lib/page-object/selenium_page_object.rb

@@ -423,7 +423,7 @@ module PageObject
     private
     
     def add_tagname_if_needed identifier, tag, additional=nil
-      return identifier if identifier.length < 2 and identifier[:index].nil?
+      return identifier if identifier.length < 2 and supported_identifier(identifier, tag, additional)
       identifier[:tag_name] = tag
       if additional
         additional.each do |key, value|
@@ -432,6 +432,13 @@ module PageObject
       end
       identifier
     end
+    
+    def supported_identifier(identifier, tag, additional)
+      return false if identifier[:index]
+      return false if identifier[:text] and tag == 'input' and additional[:type] == 'hidden'
+      return false if identifier[:href] and tag == 'a'
+      true
+    end
         
   end
 end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

data/page-object.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'watir-webdriver', '>= 0.2.5'
-  s.add_dependency 'selenium-webdriver', '>= 0.2.2' 
+  s.add_dependency 'watir-webdriver', '>= 0.2.6'
+  s.add_dependency 'selenium-webdriver', '>= 2.0.1' 
   
-  s.add_development_dependency 'rspec', '>= 2.5.0'
-  s.add_development_dependency 'cucumber', '>= 0.10.2'
-  s.add_development_dependency 'yard', '>= 0.6.8'
+  s.add_development_dependency 'rspec', '>= 2.6.0'
+  s.add_development_dependency 'cucumber', '>= 1.0.0'
+  s.add_development_dependency 'yard', '>= 0.7.2'
   
 end

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

@@ -7,8 +7,82 @@ describe PageObject::Elements::Element do
   let(:selenium_driver) { double('selenium') }
   let(:watir_element) { PageObject::Elements::Element.new(watir_driver, :platform => :watir) }
   let(:selenium_element) { PageObject::Elements::Element.new(selenium_driver, :platform => :selenium) }
+  let(:element) {PageObject::Elements::Element}
 
-  context "on a Watir page-object" do
+  context "when building the identifiers for Watir" do
+    it "should build xpath when finding elements by name where not supported" do
+      ['table', 'span', 'div', 'td', 'li', 'ol', 'ul'].each do |tag|
+        how = {:tag_name => tag, :name => 'blah'}
+        result = element.watir_identifier_for how
+        result[:xpath].should == ".//#{tag}[@name='blah']"
+      end
+    end
+  end
+  
+  context "when building the identifiers for Selenium" do
+    def all_basic_elements
+      ['textarea', 'select', 'a', 'div', 'span', 'table', 'td', 'img', 'form', 'li', 'ul', 'ol']
+    end
+    
+    def all_input_elements
+      ['text', 'hidden', 'checkbox', 'radio', 'submit']
+    end
+    
+    it "should build xpath when index is provided for basic elements" do
+      all_basic_elements.each do |tag|
+        identifier = {:tag_name => tag, :index => 1}
+        how, what = element.selenium_identifier_for identifier
+        how.should == :xpath
+        what.should == ".//#{tag}[2]"
+      end
+    end
+    
+    it "should should build xpath when index is provided for input elements" do
+      all_input_elements.each do |tag|
+        identifier = {:tag_name => 'input', :type => tag, :index => 1}
+        how, what = element.selenium_identifier_for identifier
+        how.should == :xpath
+        what.should == ".//input[@type='#{tag}'][2]"
+      end
+    end
+    
+    it "should build xpath when locating basic elements by name and index" do
+      all_basic_elements.each do |tag|
+        identifier = {:tag_name => tag, :name => 'blah', :index => 0}
+        how, what = element.selenium_identifier_for identifier
+        how.should == :xpath
+        what.should == ".//#{tag}[@name='blah'][1]"
+      end
+    end
+    
+    it "should build xpath when locating input elements by name and index" do
+      all_input_elements.each do |type|
+        identifier = {:tag_name => 'input', :type => "#{type}", :name => 'blah', :index => 0}
+        how, what = element.selenium_identifier_for identifier
+        how.should == :xpath
+        what.should == ".//input[@type='#{type}' and @name='blah'][1]"
+      end
+    end
+    
+    it "should build xpath when locating basic elements by name and class" do
+      all_basic_elements.each do |tag|
+        identifier = {:tag_name => tag, :name => 'foo', :class => 'bar'}
+        how, what = element.selenium_identifier_for identifier
+        how.should == :xpath
+        what.should == ".//#{tag}[@name='foo' and @class='bar']"
+      end      
+    end
+
+    it "should build xpath when locating input elements by name and class" do
+      all_input_elements.each do |type|
+        identifier = {:tag_name => 'input', :type => "#{type}", :name => 'foo', :class => 'bar'}
+        how, what = element.selenium_identifier_for identifier
+        what.should == ".//input[@type='#{type}' and @name='foo' and @class='bar']"
+      end      
+    end
+  end
+
+  context "when using Watir" do
     it "should know when it is visible" do
       watir_driver.should_receive(:present?).and_return(true)
       watir_element.visible?.should == true
@@ -60,7 +134,7 @@ describe PageObject::Elements::Element do
     end
   end
   
-  context "on a Selenium page-object" do
+  context "when using Selenium" do
     it "should know when it is visible" do
       selenium_driver.should_receive(:displayed?).and_return(true)
       selenium_element.visible?.should == true

data/spec/page-object/selenium_page_object_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'page-object/selenium_page_object'
+require 'page-object/elements'
+
+class TestPageObject
+  include PageObject
+end
+
+describe PageObject::SeleniumPageObject do
+  let(:selenium_browser) { mock_selenium_browser }
+  let(:selenium_page_object) { TestPageObject.new(selenium_browser) }
+
+  context "when building identifiers hash" do
+    it "should add tag_name when identifying by text for hidden_field" do
+      expected_identifier = {:text => 'foo', :tag_name => 'input', :type => 'hidden'}
+      PageObject::Elements::HiddenField.should_receive(:selenium_identifier_for).with(expected_identifier)
+      selenium_browser.should_receive(:find_element)
+      selenium_page_object.platform.hidden_field_for(:text => 'foo')
+    end
+    
+    it "should add tag_name when identifying by href for anchor" do
+      expected_identifier = {:href => 'foo', :tag_name => 'a'}
+      PageObject::Elements::Link.should_receive(:selenium_identifier_for).with(expected_identifier)
+      selenium_browser.should_receive(:find_element)
+      selenium_page_object.platform.link_for(:href => 'foo')
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: page-object
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jeff Morgan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 Z
+date: 2011-07-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: watir-webdriver
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.5
+        version: 0.2.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.2
+        version: 2.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.2
+        version: 1.0.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.8
+        version: 0.7.2
   type: :development
   version_requirements: *id005
 description: Page Object DSL that works with both Watir and Selenium
@@ -80,6 +80,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - ChangeLog
 - Gemfile
 - LICENSE
@@ -183,6 +184,7 @@ files:
 - spec/page-object/elements/unordered_list_spec.rb
 - spec/page-object/page-object_spec.rb
 - spec/page-object/page_factory_spec.rb
+- spec/page-object/selenium_page_object_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/cheezy/page-object
 licenses: []
@@ -263,4 +265,5 @@ test_files:
 - spec/page-object/elements/unordered_list_spec.rb
 - spec/page-object/page-object_spec.rb
 - spec/page-object/page_factory_spec.rb
+- spec/page-object/selenium_page_object_spec.rb
 - spec/spec_helper.rb