page-object 0.9.8 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a30377dc0af7ba09c90456f8e21a54a59f55f43f
-  data.tar.gz: 23f24c2b8aecef31248f0316f68d6fe523bd2598
+  metadata.gz: 7c96b938e70722ef3112ed42848c96a2fd3dbf39
+  data.tar.gz: 15af3e8cc3af7f269dcacecf24d6f1b38fcb9f9e
 SHA512:
-  metadata.gz: 4b9fe63e3d0c4d464b92aed01b9cf33caf9db545c0df3ee5e989a85579bc4093ebc7336ad2a25d5af699fdac667cc7580442e7ea2f3bb4f81aa8e69ed97463c1
-  data.tar.gz: 70c3f5da44e5b37fcfca5cac3388793ce1a156dceb5cc02706a6abf1406601b95c4a33f79359f15cedafb3d83f68bf457c2564e032a4dc1df4638ce674bcfdb5
+  metadata.gz: 99435b3c59bac3889037dca32b76ef15c3f90472855e06e7ea06b816a91e0d7ea82c07edd8f026f3514b1e15739b15f5a6363df9d8bca7fc834eb104243b4df5
+  data.tar.gz: e760b232a4f41f862a719585061513902f3b345dd4cd40dba732dd77d4b427bf634fe85059fdcb3c38f150de65063d8d537d595695414b9c96cb1b59eb3e72da

data/ChangeLog

@@ -1,3 +1,13 @@
+=== Version 1.0 / 2014-6-1
+* Enhancements
+  * Better support for using Regexp
+  * Added new page_url_value method that is created when you define page_url to return the value
+  * Added better error message when nil is passed to the constructor of a PageObject
+  * Updated to use the latest watir-webdriver 0.6.9
+  * Updated to use the latest selenium-webdriver 2.42.0
+* Fixes
+  * Improved handling of index locator
+
 === Version 0.9.8 / 2014-3-16
 * Enhancements
   * populate_page_with not supports radio groups

data/features/element.feature

@@ -318,6 +318,5 @@ Feature: Elements
     When I search for the paragraph by "id"
     Then I should know the paragraph class is "p_class"
 
-@focus
   Scenario: Selecting the text for an element
     Then I should be able to select "Elements" from the paragraph

data/features/html/static_elements.html

@@ -19,6 +19,7 @@
     <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>
+      <option value="option3">Test/Test 3</option>
     </select>
 
     <select multiple="multiple" id="sel_list_multiple">

data/features/link.feature

@@ -46,3 +46,7 @@ Feature: Links
   Scenario: Getting the href for a link
     When I get the href for the link
     Then I should know it was "success.html"
+
+  Scenario: Locating a link using a partial href
+    When I get the link using the href success
+    Then I should be able to click the link

data/features/select_list.feature

@@ -9,6 +9,10 @@ Feature: Select List
   Scenario: Selecting an element on the select list
     When I select "Test 2" from the select list
     Then the current item should be "Test 2"
+    
+  Scenario: Selecting an element when there is a forward slash
+    When I select "Test/Test 3" from the select list
+    Then the current item should be "Test/Test 3"
 
   Scenario Outline: Locating select lists on the Page
     When I search for the select list by "<search_by>"

data/features/step_definitions/link_steps.rb

@@ -30,3 +30,11 @@ end
 Then(/^I should know it was "(.*?)"$/) do |href|
   @href.should include href
 end
+
+When(/^I get the link using the href success$/) do
+  @link = @page.link_element(:href => /succ.*html/)
+end
+
+Then(/^I should be able to click the link$/) do
+  @link.click
+end

data/lib/page-object/accessors.rb

@@ -39,11 +39,15 @@ module PageObject
     #
     def page_url(url)
       define_method("goto") do
+        platform.navigate_to self.page_url_value
+      end
+
+      define_method('page_url_value') do
         lookup = url.kind_of?(Symbol) ? self.send(url) : url
         erb = ERB.new(%Q{#{lookup}})
         merged_params = self.class.instance_variable_get("@merged_params")
         params = merged_params ? merged_params : self.class.params
-        platform.navigate_to erb.result(binding)
+        erb.result(binding)
       end
     end
     alias_method :direct_url, :page_url

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

@@ -122,14 +122,14 @@ module PageObject
           end
           xpath = ".//button"
           xpath << "[#{attribute_expression(btn_ident)}]" unless btn_ident.empty?
-          xpath << "[#{idx+1}]" if idx
+          xpath = "(#{xpath})[#{idx+1}]" if idx
           identifier[:type] = %w[button reset submit image]
           xpath << " | .//input"
         else
           xpath = ".//#{tag_locator}"
         end
         xpath << "[#{attribute_expression(identifier)}]" unless identifier.empty?
-        xpath << "[#{idx+1}]" if idx
+        xpath = "(#{xpath})[#{idx+1}]" if idx
         xpath
       end
 

data/lib/page-object/loads_platform.rb

@@ -18,7 +18,9 @@ module PageObject
       adapters.each_value { |adapter|
         return adapter.create_page_object(browser) if adapter.is_for?(browser)
       }
-      raise 'Unable to pick a platform for the provided browser'
+      message = 'Unable to pick a platform for the provided browser.'
+      message += "\nnil was passed to the PageObject constructor instead of a valid browser object." if browser.nil?
+      raise message 
     end
   end
 end

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

@@ -114,7 +114,7 @@ module PageObject
         def execute_script(script, *args)
           @browser.execute_script(script, *args)
         end
-        
+
         #
         # platform method to handle attaching to a running window
         # See PageObject#attach_to_window
@@ -151,7 +151,7 @@ module PageObject
           block.call(nil)
           @browser.switch_to.default_content
         end
-        
+
         #
         # platform method to switch to an iframe and execute a block
         # See PageObject#in_frame
@@ -161,7 +161,7 @@ module PageObject
           block.call(nil)
           @browser.switch_to.default_content
         end
-        
+
         #
         # platform method to refresh the page
         # See PageObject#refresh
@@ -185,7 +185,7 @@ module PageObject
         def forward
           @browser.navigate.forward
         end
-        
+
         #
         # platform method to clear the cookies from the browser
         # See PageObject#clear_cookies
@@ -193,7 +193,7 @@ module PageObject
         def clear_cookies
           @browser.manage.delete_all_cookies
         end
-        
+
         #
         # platform method to save the current screenshot to a file
         # See PageObject#save_screenshot
@@ -534,7 +534,7 @@ module PageObject
         def buttons_for(identifier)
           find_selenium_elements(identifier, Elements::Button, 'input', :type => 'submit')
         end
-        
+
         #
         # platform method to return the text for a table
         # See PageObject::Accessors#table
@@ -682,7 +682,7 @@ module PageObject
         def ordered_list_for(identifier)
           find_selenium_element(identifier, Elements::OrderedList, 'ol')
         end
-        
+
         #
         # platform method to retrieve all ordered lists
         #
@@ -699,7 +699,7 @@ module PageObject
             @browser.find_element(how, what).text
           end
         end
-        
+
         #
         # platform method to retrieve the h1 element
         # See PageObject::Accessors#h1
@@ -724,7 +724,7 @@ module PageObject
             @browser.find_element(how, what).text
           end
         end
-        
+
         #
         # platform method to retrieve the h2 element
         # See PageObject::Accessors#h2
@@ -749,7 +749,7 @@ module PageObject
             @browser.find_element(how, what).text
           end
         end
-        
+
         #
         # platform method to retrieve the h3 element
         # See PageObject::Accessors#h3
@@ -774,7 +774,7 @@ module PageObject
             @browser.find_element(how, what).text
           end
         end
-        
+
         #
         # platform method to retrieve the h4 element
         # See PageObject::Accessors#h4
@@ -799,7 +799,7 @@ module PageObject
             @browser.find_element(how, what).text
           end
         end
-        
+
         #
         # platform method to retrieve the h5 element
         # See PageObject::Accessors#h5
@@ -824,7 +824,7 @@ module PageObject
             @browser.find_element(how, what).text
           end
         end
-        
+
         #
         # platform method to retrieve the h6 element
         # See PageObject::Accessors#h6
@@ -849,7 +849,7 @@ module PageObject
             @browser.find_element(how, what).text
           end
         end
-        
+
         #
         # platform method to retrieve the paragraph element
         # See PageObject::Accessors#paragraph
@@ -953,7 +953,7 @@ module PageObject
         def canvass_for(identifier)
           find_selenium_elements(identifier, Elements::Canvas, 'canvas')
         end
-        
+
         #
         # platform method to retrieve an audio element
         #
@@ -967,7 +967,7 @@ module PageObject
         def audios_for(identifier)
           find_selenium_elements(identifier, Elements::Audio, 'audio')
         end
-        
+
         #
         # platform method to retrieve a video element
         #
@@ -981,7 +981,7 @@ module PageObject
         def videos_for(identifier)
           find_selenium_elements(identifier, Elements::Video, 'video')
         end
-        
+
         #
         # platform method to retrieve a generic element
         # See PageObject::Accessors#element
@@ -1004,16 +1004,16 @@ module PageObject
         def svg_for(identifier)
           find_selenium_element(identifier, Elements::Element, 'svg')
         end
- 
+
         #
         # platform method to return an array of svg elements
         #
         def svgs_for(identifier)
           find_selenium_elements(identifier, Elements::Element, 'svg')
         end
- 
+
         private
-        
+
         def process_selenium_call(identifier, type, tag, other=nil)
           how, what, frame_identifiers = parse_identifiers(identifier, type, tag, other)
           switch_to_frame(frame_identifiers)
@@ -1023,10 +1023,16 @@ module PageObject
         end
 
         def find_selenium_element(identifier, type, tag, other=nil)
+          regexp = delete_regexp(identifier)
           how, what, frame_identifiers = parse_identifiers(identifier, type, tag, other)
           switch_to_frame(frame_identifiers)
           begin
-            element = @browser.find_element(how, what)
+            unless regexp
+              element = @browser.find_element(how, what)
+            else
+              elements = @browser.find_elements(how, what)
+              element = elements.find {|ele| matches_selector?(ele, regexp[0], regexp[1])}
+            end
           rescue Selenium::WebDriver::Error::NoSuchElementError
             @browser.switch_to.default_content unless frame_identifiers.nil?
             return build_null_object(identifier, type, tag, other)
@@ -1036,9 +1042,15 @@ module PageObject
         end
 
         def find_selenium_elements(identifier, type, tag, other=nil)
+          regexp = delete_regexp(identifier)
           how, what, frame_identifiers = parse_identifiers(identifier, type, tag, other)
           switch_to_frame(frame_identifiers)
-          elements = @browser.find_elements(how, what)
+          unless regexp
+            elements = @browser.find_elements(how, what)
+          else
+            eles = @browser.find_elements(how, what)
+            elements = eles.find_all {|ele| matches_selector?(ele, regexp[0], regexp[1])}
+          end
           @browser.switch_to.default_content unless frame_identifiers.nil?
           elements.map { |element| type.new(element, :platform => :selenium_webdriver) }
         end
@@ -1053,6 +1065,12 @@ module PageObject
           Elements::Element.new(null_element, :platform => :selenium_webdriver)
         end
 
+        def delete_regexp(identifier)
+          regexp = identifier.find {|ident| ident[1].is_a?(Regexp)}
+          identifier.delete(regexp[0]) if regexp
+          regexp
+        end
+
         def parse_identifiers(identifier, element, tag_name=nil, additional=nil)
           frame_identifiers = identifier.delete(:frame)
           identifier = add_tagname_if_needed identifier, tag_name, additional if tag_name
@@ -1096,6 +1114,23 @@ module PageObject
           true
         end
 
+        def matches_selector?(element, how, what)
+          what === fetch_value(element, how)
+        end
+
+        def fetch_value(element, how)
+          case how
+          when :text
+            element.text
+          when :tag_name
+            element.tag_name.downcase
+          when :href
+            (href = element.attribute(:href)) && href.strip
+          else
+            element.attribute(how.to_s.gsub("_", "-").to_sym)
+          end
+        end
+
         def switch_to_frame(frame_identifiers)
           unless frame_identifiers.nil?
             frame_identifiers.each do |frame|
@@ -1103,7 +1138,7 @@ module PageObject
               value = frame_id.values.first
               @browser.switch_to.frame(value)
             end
-          end          
+          end
         end
       end
     end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.9.8"
+  VERSION = "1.0"
 end

data/page-object.gemspec

@@ -20,8 +20,8 @@ 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.6.8'
-  s.add_dependency 'selenium-webdriver', '>= 2.40.0'
+  s.add_dependency 'watir-webdriver', '>= 0.6.9'
+  s.add_dependency 'selenium-webdriver', '>= 2.42.0'
   s.add_dependency 'page_navigation', '>= 0.9'
 
   s.add_development_dependency 'rspec', '>= 2.14.0'

data/spec/page-object/element_locators_spec.rb

@@ -1003,7 +1003,7 @@ describe PageObject::ElementLocators do
     end
 
     it "should find an area element using a default identifier" do
-      selenium_browser.should_receive(:find_element).with(:xpath, './/area[1]').and_return(selenium_browser)
+      selenium_browser.should_receive(:find_element).with(:xpath, '(.//area)[1]').and_return(selenium_browser)
       selenium_page_object.area_element
     end
 
@@ -1025,7 +1025,7 @@ describe PageObject::ElementLocators do
     end
 
     it "should find a canvas element using a default identifier" do
-      selenium_browser.should_receive(:find_element).with(:xpath, './/canvas[1]').and_return(selenium_browser)
+      selenium_browser.should_receive(:find_element).with(:xpath, '(.//canvas)[1]').and_return(selenium_browser)
       selenium_page_object.canvas_element
     end
 
@@ -1047,7 +1047,7 @@ describe PageObject::ElementLocators do
     end
 
     it "should find an audio element using a default identifier" do
-      selenium_browser.should_receive(:find_element).with(:xpath, './/audio[1]').and_return(selenium_browser)
+      selenium_browser.should_receive(:find_element).with(:xpath, '(.//audio)[1]').and_return(selenium_browser)
       selenium_page_object.audio_element
     end
 

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

@@ -28,7 +28,7 @@ describe "Element" do
         identifier = {:tag_name => tag, :index => 1}
         how, what = PageObject::Elements::Element.selenium_identifier_for identifier
         how.should == :xpath
-        what.should == ".//#{tag}[2]"
+        what.should == "(.//#{tag})[2]"
       end
     end
 
@@ -37,7 +37,7 @@ describe "Element" do
         identifier = {:tag_name => 'input', :type => tag, :index => 1}
         how, what = PageObject::Elements::Element.selenium_identifier_for identifier
         how.should == :xpath
-        what.should include ".//input[@type='#{tag}'][2]"
+        what.should include "(.//input[@type='#{tag}'])[2]"
       end
     end
 
@@ -46,7 +46,7 @@ describe "Element" do
         identifier = {:tag_name => tag, :name => 'blah', :index => 0}
         how, what = PageObject::Elements::Element.selenium_identifier_for identifier
         how.should == :xpath
-        what.should == ".//#{tag}[@name='blah'][1]"
+        what.should == "(.//#{tag}[@name='blah'])[1]"
       end
     end
 
@@ -55,7 +55,7 @@ describe "Element" do
         identifier = {:tag_name => 'input', :type => "#{type}", :name => 'blah', :index => 0}
         how, what = PageObject::Elements::Element.selenium_identifier_for identifier
         how.should == :xpath
-        what.should include ".//input[@type='#{type}' and @name='blah'][1]"
+        what.should include "(.//input[@type='#{type}' and @name='blah'])[1]"
       end
     end
 

data/spec/page-object/loads_platform_spec.rb

@@ -5,6 +5,7 @@ end
 describe TestLoadsPlatform do
   let(:subject) { TestLoadsPlatform.new }
   let(:adapters) { {} }
+
   context "when browser x is registered with platform nom_nom_nom" do
     let(:browser_x) { double('browser') }
     before { adapters[:browser_x] = mock_adapter(browser_x, :nom_nom_nom) }
@@ -12,27 +13,41 @@ describe TestLoadsPlatform do
     it "returns platform nom_nom_nom  when asked about browser_x" do
       subject.load_platform(browser_x, adapters).should == :nom_nom_nom
     end
+    
     context "when browser a is registered with platform boom_boom_boom" do
       let(:browser_a) { double('browser') }
       before { adapters[:browser_a] = mock_adapter(browser_a, :boom_boom_boom) }
+      
       it "should return platform nom_nom_nom when asked about browser_x" do
         subject.load_platform(browser_x, adapters).should == :nom_nom_nom
       end
     end
   end
+  
   context "when browser a is registered with platform boom_boom_boom" do
     let(:browser_n) { double('browser') }
     before { adapters[:browser_n] = mock_adapter(browser_n, :boom_boom_boom) }
+
     it "should return platform boom_boom_boom" do
       subject.load_platform(browser_n, adapters).should == :boom_boom_boom
     end
   end
 
   context "When an unknow object is passed in" do
+    let(:basic_message) { 'Unable to pick a platform for the provided browser.' }
+    
     it "should throw an exception" do
       expect {
-        subject.load_platform("browser")
-      }.to raise_error
+        subject.load_platform("browser", {})
+      }.to raise_error(basic_message)
+    end
+
+    it "should notify when the browser is nil" do
+      begin
+        subject.load_platform(nil, {})
+      rescue Exception => e
+        e.message.should == "#{basic_message}\nnil was passed to the PageObject constructor instead of a valid browser object."
+      end
     end
   end
 end

data/spec/page-object/watir_accessors_spec.rb

@@ -158,7 +158,7 @@ describe PageObject::Accessors do
       SymbolPageUrl.new(watir_browser, true, 'custom')
 
       watir_browser.should_receive(:goto).with('different')
-      SymbolPageUrl.new(watir_browser, true, 'different')
+      SymbolPageUrl.new(watir_browser, true, 'different')      
     end
 
     it "should not navigate to a page when not requested" do
@@ -170,6 +170,10 @@ describe PageObject::Accessors do
       watir_browser.should_not_receive(:goto)
       WatirBlockPageObject.new(watir_browser, true)
     end
+
+    it "should provide the page url" do
+      watir_page_object.page_url_value.should == 'http://apple.com'
+    end
   end
 
   context "validating the page title" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: '1.0'
 platform: ruby
 authors:
 - Jeff Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.6.9
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.40.0
+        version: 2.42.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.40.0
+        version: 2.42.0
 - !ruby/object:Gem::Dependency
   name: page_navigation
   requirement: !ruby/object:Gem::Requirement