page-object 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b60613a20247f2e26ec7fe5df521f0622035c18
-  data.tar.gz: bc07cf9b7590f3077227ed25750494c527b36892
+  metadata.gz: b4427749437df9f9b92f059425594d069c769766
+  data.tar.gz: 4da711511069744d4412b5c68fc1ad531144eb22
 SHA512:
-  metadata.gz: c150363a5db1f94851f6b680de80b2f2b2fac5172071ce799b18f2ed1c01280c2ff83837026abf21f1ce31efcb7ebe7a776e1cf49b70f4a54e6bba4a5330d36b
-  data.tar.gz: 2871e1bbe2d0a64441bc722fc45db5e72175e685f691642c04024193b20b0cc9e614aebae9f68becd11048d2e8966fc75471d617909e7b8d8a71525e4a324f5a
+  metadata.gz: c1cb457f915d76893f24078e0f28f329a428c85df32c2e4b8161504fa53366d24fce799a6c5e104670c8d3864dda6813a94b8a6eb23de10186fa7eb17441582e
+  data.tar.gz: 6501e40f5db81abc012c9cea21dbc274a8118fe453150ff5f716a026baae9754180ba8222a541c678dd900403923eb31376608ee615dbdeef7e5ad5fcc323c12

data/ChangeLog

@@ -1,3 +1,9 @@
+=== Version 0.9.6 / 2014-2-4
+* Enhancements
+  * Updated to use the latest watir-webdriver 0.6.7
+* Fixes
+  * Added in_iframe methods to match the updates to the watir-webdriver gem.
+
 === Version 0.9.5 / 2014-1-22
 * Enhancements
   * Updated to use the latest selenium-webdriver 2.39.0

data/features/step_definitions/frames_steps.rb

@@ -28,13 +28,40 @@ class FramePage
   
 end
 
+class IFramePage
+  include PageObject
+
+  in_iframe(:id => 'frame_two_2') do |frame|
+    text_field(:text_field_2_id, :name => 'recieverElement', :frame => frame)
+  end
+  in_iframe(:id => 'frame_one_1') do |frame|
+    text_field(:text_field_1_id, :name => 'senderElement', :frame => frame)
+  end
+
+  in_iframe(:name => 'frame2') do |frame|
+    text_field(:text_field_2_name, :name => 'recieverElement', :frame => frame)
+  end
+  in_iframe(:name => 'frame1') do |frame|
+    text_field(:text_field_1_name, :name => 'senderElement', :frame => frame)
+  end
+
+  in_iframe(:index => 1) do |frame|
+    text_field(:text_field_2_index, :name => 'recieverElement', :frame => frame)
+  end
+  in_iframe(:index => 0) do |frame|
+    text_field(:text_field_1_index, :name => 'senderElement', :frame => frame)
+  end
+
+end
+
+
 Given /^I am on the frame elements page$/ do
   @page = FramePage.new(@browser)
   @page.navigate_to(UrlHelper.frame_elements)
 end
 
 Given /^I am on the iframe elements page$/ do
-  @page = FramePage.new(@browser)
+  @page = IFramePage.new(@browser)
   @page.navigate_to(UrlHelper.iframe_elements)
 end
 
@@ -64,7 +91,7 @@ class NestedFramePage
   include PageObject
   
   in_frame(:id => 'two') do |frame|
-    in_frame({:id => 'three'}, frame) do |nested_frame|
+    in_iframe({:id => 'three'}, frame) do |nested_frame|
       link(:nested_link, :id => 'four', :frame => nested_frame)
     end
   end

data/lib/page-object/accessors.rb

@@ -133,7 +133,7 @@ module PageObject
     end
 
     #
-    # Identify an element as existing within a frame or iframe.  A frame parameter
+    # Identify an element as existing within a frame .  A frame parameter
     # is passed to the block and must be passed to the other calls to PageObject.
     # You can nest calls to in_frame by passing the frame to the next level.
     #
@@ -152,7 +152,31 @@ module PageObject
     #
     def in_frame(identifier, frame=nil, &block)
       frame = [] if frame.nil?
-      frame << identifier
+      frame << {frame: identifier}
+      block.call(frame)
+    end
+
+    #
+    # Identify an element as existing within an iframe.  A frame parameter
+    # is passed to the block and must be passed to the other calls to PageObject.
+    # You can nest calls to in_frame by passing the frame to the next level.
+    #
+    # @example
+    #   in_iframe(:id => 'frame_id') do |frame|
+    #     text_field(:first_name, :id => 'fname', :frame => frame)
+    #   end
+    #
+    # @param [Hash] identifier how we find the frame.  The valid keys are:
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :regexp => Watir only
+    # @param frame passed from a previous call to in_iframe.  Used to nest calls
+    # @param block that contains the calls to elements that exist inside the iframe.
+    #
+    def in_iframe(identifier, frame=nil, &block)
+      frame = [] if frame.nil?
+      frame << {iframe: identifier}
       block.call(frame)
     end
 

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

@@ -147,7 +147,17 @@ module PageObject
         # See PageObject#in_frame
         #
         def in_frame(identifier, frame=nil, &block)
-          switch_to_frame([identifier])
+          switch_to_frame([frame: identifier])
+          block.call(nil)
+          @browser.switch_to.default_content
+        end
+        
+        #
+        # platform method to switch to an iframe and execute a block
+        # See PageObject#in_frame
+        #
+        def in_iframe(identifier, frame=nil, &block)
+          switch_to_frame([iframe: identifier])
           block.call(nil)
           @browser.switch_to.default_content
         end
@@ -1088,7 +1098,8 @@ module PageObject
 
         def switch_to_frame(frame_identifiers)
           unless frame_identifiers.nil?
-            frame_identifiers.each do |frame_id|
+            frame_identifiers.each do |frame|
+              frame_id = frame.values.first
               value = frame_id.values.first
               @browser.switch_to.frame(value)
             end

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

@@ -141,7 +141,17 @@ module PageObject
         #
         def in_frame(identifier, frame=nil, &block)
           frame = [] if frame.nil?
-          frame << identifier
+          frame << {frame: identifier}
+          block.call(frame)
+        end
+    
+        #
+        # platform method to switch to an iframe and execute a block
+        # See PageObject#in_frame
+        #
+        def in_iframe(identifier, frame=nil, &block)
+          frame = [] if frame.nil?
+          frame << {iframe: identifier}
           block.call(frame)
         end
     
@@ -994,13 +1004,15 @@ module PageObject
         def nested_frames(frame_identifiers)
           return if frame_identifiers.nil?
           frame_str = ''
-          frame_identifiers.each do |id|
+          frame_identifiers.each do |frame|
+            id = frame.values.first
+            type = frame.keys.first
             value = id.values.first
             if value.is_a?(Regexp)
-              frame_str += "frame(:#{id.keys.first} => #{value.inspect})."
+              frame_str += "#{type.to_s}(:#{id.keys.first} => #{value.inspect})."
             else
-              frame_str += "frame(:#{id.keys.first} => #{value})." if value.to_s.is_integer
-              frame_str += "frame(:#{id.keys.first} => '#{value}')." unless value.to_s.is_integer
+              frame_str += "#{type.to_s}(:#{id.keys.first} => #{value})." if value.to_s.is_integer
+              frame_str += "#{type.to_s}(:#{id.keys.first} => '#{value}')." unless value.to_s.is_integer
             end
           end
           frame_str
@@ -1028,7 +1040,8 @@ module PageObject
 
         def switch_to_frame(frame_identifiers)
           unless frame_identifiers.nil?
-            frame_identifiers.each do |frame_id|
+            frame_identifiers.each do |frame|
+              frame_id = frame.values.first
               value = frame_id.values.first
               @browser.wd.switch_to.frame(value)
             end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/page-object.gemspec

@@ -20,7 +20,7 @@ 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.4'
+  s.add_dependency 'watir-webdriver', '>= 0.6.7'
   s.add_dependency 'selenium-webdriver', '>= 2.39.0'
   s.add_dependency 'page_navigation', '>= 0.9'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Jeff Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.7
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement