RubyGems - page-object - Versions diffs - 0.5.0 → 0.5.1 - Mend

page-object 0.5.0 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

data/ChangeLog +8 -0
data/features/frames.feature +20 -0
data/features/html/frame_3.html +14 -0
data/features/html/frames.html +5 -4
data/features/step_definitions/frames_steps.rb +39 -4
data/features/step_definitions/page_level_actions_steps.rb +1 -1
data/lib/page-object.rb +30 -6
data/lib/page-object/platforms/selenium_webdriver/page_object.rb +13 -4
data/lib/page-object/platforms/watir_webdriver/page_object.rb +42 -6
data/lib/page-object/version.rb +1 -1
data/page-object.gemspec +2 -2
data/spec/page-object/page-object_spec.rb +6 -3
metadata +6 -4

data/ChangeLog CHANGED Viewed

@@ -1,3 +1,11 @@
+=== Version 0.5.1 / 2011-11-16
+* Enhancements
+  * Added instance level in_frame method
+  * Support for nesting all *_element instance methods inside in_frame call
+  * Support for nesting alerts inside an in_frame call
+  * Support for nesting confirms inside an in_frame call
+  * Support for nesting prompts inside an in_frame call
 === Version 0.5 / 2011-11-06
 * Enhancements
   * Validated support for JRuby

data/features/frames.feature CHANGED Viewed

@@ -35,3 +35,23 @@ Feature: Handling frames
   Scenario: Nested frames
     Given I am on the nested frame elements page
     Then I should be able to click the link in the frame
+  Scenario: Identifying items in frames at runtime
+    Given I am on the frame elements page
+    When I type "page-object" into the text field from frame 1 identified dynamically
+    Then I should verify "page-object" in the text field for frame 1 identified dynamically
+  Scenario: Handling alerts inside frames
+    Given I am on the frame elements page
+    When I trigger an alert within a frame
+    Then I should be able to get the alert's message
+  Scenario: Handling confirms inside frames
+    Given I am on the frame elements page
+    When I trigger a confirm within a frame
+    Then I should be able to get the confirm message
+  Scenario: Handling prompts inside frames
+    Given I am on the frame elements page
+    When I trigger a prompt within a frame
+    Then I should be able to get the message and default value

data/features/html/frame_3.html ADDED Viewed

@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <title>Frame 1</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  </head>
+  <body>
+    <h1>Frame 3</h1>
+    <p>Nam accumsan. Donec nisi pede, interdum eget, ultrices ac, vulputate vitae, nunc. Nulla lorem. Duis cursus pharetra dolor. Nulla accumsan hendrerit leo. Vivamus commodo. Nullam dignissim adipiscing est. Aliquam vitae orci in risus lobortis luctus. Ut luctus fermentum ligula. Nullam ipsum. Suspendisse sit amet nisi.</p>
+    <input id=alert_button type=button onclick="alert('I am an alert')" value=Alert>
+    <input id=confirm_button type=button onclick="this.value = confirm('set the value')" value=Confirm>
+    <input id=prompt_button type=button onclick='this.value = prompt("enter your name", "John Doe")' value=Prompt>
+  </body>
+</html>

data/features/html/frames.html CHANGED Viewed

@@ -4,8 +4,9 @@
         <title>Frames</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     </head>
-    <frameset cols="50%, 50%">
-        <frame src="frame_1.html" id="frame_1" name="frame1" class="half" />
-        <frame src="frame_2.html" id="frame_2" name="frame2" class="half" />
+    <frameset cols="40%, 40%, 20%">
+        <frame src="frame_1.html" id="frame_1" name="frame1"/>
+        <frame src="frame_2.html" id="frame_2" name="frame2"/>
+        <frame src="frame_3.html" id="frame_3" name="frame3"/>
     </frameset>
-</html>
+</html>

data/features/step_definitions/frames_steps.rb CHANGED Viewed

@@ -33,20 +33,20 @@ Given /^I am on the iframe elements page$/ do
   @page.navigate_to(UrlHelper.iframe_elements)
 end
-When /^I type "([^"]*)" into the text field for frame 2 using "([^"]*)"$/ do |text, arg_type|
+When /^I type "([^\"]*)" into the text field for frame 2 using "([^\"]*)"$/ do |text, arg_type|
   @page.send "text_field_2_#{arg_type}=".to_sym, text
 end
-Then /^I should verify "([^"]*)" is in the text field for frame 2 using "([^"]*)"$/ do |text, arg_type|
+Then /^I should verify "([^\"]*)" is in the text field for frame 2 using "([^\"]*)"$/ do |text, arg_type|
   result = @page.send "text_field_2_#{arg_type}".to_sym
   result.should == text
 end
-When /^I type "([^"]*)" into the text field from frame 1 using "([^"]*)"$/ do |text, arg_type|
+When /^I type "([^\"]*)" into the text field from frame 1 using "([^\"]*)"$/ do |text, arg_type|
   @page.send "text_field_1_#{arg_type}=".to_sym, text
 end
-Then /^I should verify "([^"]*)" is in the text field for frame 1 using "([^"]*)"$/ do |text, arg_type|
+Then /^I should verify "([^\"]*)" is in the text field for frame 1 using "([^\"]*)"$/ do |text, arg_type|
   result = @page.send "text_field_1_#{arg_type}".to_sym
   result.should == text
 end
@@ -71,3 +71,38 @@ Then /^I should be able to click the link in the frame$/ do
   @page.text.should include "Success"
 end
+When /^I type "([^\"]*)" into the text field from frame 1 identified dynamically$/ do |value|
+  @page.in_frame(:id => 'frame_1') do |frame|
+    @page.text_field_element(:name => 'senderElement', :frame => frame).value = value
+  end
+end
+Then /^I should verify "([^\"]*)" in the text field for frame 1 identified dynamically$/ do |value|
+  @page.in_frame(:id => 'frame_1') do |frame|
+    @page.text_field_element(:name => 'senderElement', :frame => frame).value.should == value
+  end
+end
+When /^I trigger an alert within a frame$/ do
+  @page.in_frame(:id => 'frame_3') do |frame|
+    @msg = @page.alert(frame) do
+      @page.button_element(:id => 'alert_button', :frame => frame).click
+    end
+  end
+end
+When /^I trigger a confirm within a frame$/ do
+  @page.in_frame(:id => 'frame_3') do |frame|
+    @msg = @page.confirm(true, frame) do
+      @page.button_element(:id => 'confirm_button', :frame => frame).click
+    end
+  end
+end
+When /^I trigger a prompt within a frame$/ do
+  @page.in_frame(:id => 'frame_3') do |frame|
+    @msg = @page.prompt("Cheezy", frame) do
+      @page.button_element(:id => 'prompt_button', :frame => frame).click
+    end
+  end
+end

data/features/step_definitions/page_level_actions_steps.rb CHANGED Viewed

@@ -23,7 +23,7 @@ When /^I handle the alert$/ do
   end
 end
-Then /^I should be able to get the alert's message$/ do
+Then /^I should be able to get the alert\'s message$/ do
   @msg.should == "I am an alert"
 end

data/lib/page-object.rb CHANGED Viewed

@@ -121,11 +121,12 @@ module PageObject
   #     @page.button_that_causes_alert
   #   end
   #
+  # @param frame optional parameter used when alert is nested within a frame
   # @param block a block that has the call that will cause the alert to display
   # @return [String] the message that was contained in the alert
   #
-  def alert(&block)
-    platform.alert(&block)
+  def alert(frame=nil, &block)
+    platform.alert(frame, &block)
   end
   #
@@ -137,11 +138,12 @@ module PageObject
   #   end
   #
   # @param [bool] what response you want to return back from the confirm popup
+  # @param frame optional parameter used when the confirm is nested within a frame
   # @param block a block that has the call that will cause the confirm to display
   # @return [String] the message that was prompted in the confirm
   #
-  def confirm(response, &block)
-    platform.confirm(response, &block)
+  def confirm(response, frame=nil, &block)
+    platform.confirm(response, frame, &block)
   end
   #
@@ -153,14 +155,36 @@ module PageObject
   #   end
   #
   # @param [string] the value returned to the caller of the prompt
+  # @param frame optional parameter used with the prompt is nested within a frame
   # @param block a block that has the call that will cause the prompt to display
   # @return [Hash] A has containing two keys - :message contains the prompt message and
   # :default_value contains the default value for the prompt if provided
   #
-  def prompt(answer, &block)
-    platform.prompt(answer, &block)
+  def prompt(answer, frame=nil, &block)
+    platform.prompt(answer, frame, &block)
   end
+  #
+  # Identify an element as existing within a frame or 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_frame(:id => 'frame_id') do |frame|
+  #     text_field_element(: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
+  # @param frame passed from a previous call to in_frame.  Used to nest calls
+  # @param block that contains the calls to elements that exist inside the frame.
+  #
+  def in_frame(identifier, frame=nil, &block)
+    platform.in_frame(identifier, frame, &block)
+  end
   #
   # Override the normal showModalDialog call is it opens a window instead
   # of a dialog.  You will need to attach to the new window in order to

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

@@ -68,7 +68,7 @@ module PageObject
         # platform method to handle an alert popup
         # See PageObject#alert
         #
-        def alert(&block)
+        def alert(frame=nil, &block)
           @browser.execute_script "window.alert = function(msg) { window.__lastWatirAlert = msg; }"
           yield
           @browser.execute_script "return window.__lastWatirAlert"
@@ -78,7 +78,7 @@ module PageObject
         # platform method to handle a confirm popup
         # See PageObject#confirm
         #
-        def confirm(response, &block)
+        def confirm(response, frame=nil, &block)
           @browser.execute_script "window.confirm = function(msg) { window.__lastWatirConfirm = msg; return #{!!response} }"
           yield
           @browser.execute_script "return window.__lastWatirConfirm"
@@ -88,11 +88,10 @@ module PageObject
         # platform method to handle a prompt popup
         # See PageObject#prompt
         #
-        def prompt(answer, &block)
+        def prompt(answer, frame=nil, &block)
           @browser.execute_script "window.prompt = function(text, value) { window.__lastWatirPrompt = { message: text, default_value: value }; return #{answer.to_json}; }"
           yield
           result = @browser.execute_script "return window.__lastWatirPrompt"
           result && result.dup.each_key { |k| result[k.to_sym] = result.delete(k) }
           result
         end
@@ -113,6 +112,16 @@ module PageObject
             end
           end
         end
+        #
+        # platform method to switch to a frame and execute a block
+        # See PageObject#in_frame
+        #
+        def in_frame(identifier, frame=nil, &block)
+          switch_to_frame([identifier])
+          block.call(nil)
+          @browser.switch_to.default_content
+        end
         #
         # platform method to refresh the page

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

@@ -69,24 +69,40 @@ module PageObject
         # platform method to handle an alert popup
         # See PageObject#alert
         #
-        def alert(&block)
-          @browser.alert(&block)
+        def alert(frame=nil, &block)
+          switch_to_frame(frame)
+          @browser.wd.execute_script "window.alert = function(msg) { window.__lastWatirAlert = msg; }"
+          yield
+          value = @browser.wd.execute_script "return window.__lastWatirAlert"
+          switch_to_default_content(frame)
+          value
         end
         #
         # platform method to handle a confirm popup
         # See PageObject#confirm
         #
-        def confirm(response, &block)
-          @browser.confirm(response, &block)
+        def confirm(response, frame=nil, &block)
+          switch_to_frame(frame)
+          @browser.wd.execute_script "window.confirm = function(msg) { window.__lastWatirConfirm = msg; return #{!!response} }"
+          yield
+          value = @browser.wd.execute_script "return window.__lastWatirConfirm"
+          switch_to_default_content(frame)
+          value
         end
         #
         # platform method to handle a prompt popup
         # See PageObject#prompt
         #
-        def prompt(answer, &block)
-          @browser.prompt(answer, &block)
+        def prompt(answer, frame=nil, &block)
+          switch_to_frame(frame)
+          @browser.wd.execute_script "window.prompt = function(text, value) { window.__lastWatirPrompt = { message: text, default_value: value }; return #{answer.to_json}; }"
+          yield
+          result = @browser.wd.execute_script "return window.__lastWatirPrompt"
+          switch_to_default_content(frame)
+          result && result.dup.each_key { |k| result[k.to_sym] = result.delete(k) }
+          result
         end
         #
@@ -97,6 +113,17 @@ module PageObject
           win_id = {identifier.keys.first => /#{Regexp.escape(identifier.values.first)}/}
           @browser.window(win_id).use &block
         end
+        #
+        # platform method to switch to a frame and execute a block
+        # See PageObject#in_frame
+        #
+        def in_frame(identifier, frame=nil, &block)
+          frame = [] if frame.nil?
+          frame << identifier
+          block.call(frame)
+        end
         #
         # platform method to refresh the page
@@ -708,6 +735,15 @@ module PageObject
         def switch_to_default_content(frame_identifiers)
           @browser.wd.switch_to.default_content unless frame_identifiers.nil?
         end
+        def switch_to_frame(frame_identifiers)
+          unless frame_identifiers.nil?
+            frame_identifiers.each do |frame_id|
+              value = frame_id.values.first
+              @browser.wd.switch_to.frame(value)
+            end
+          end
+        end
       end
     end
   end

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

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/page-object.gemspec CHANGED Viewed

@@ -19,8 +19,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.3.8'
-  s.add_dependency 'selenium-webdriver', '>= 2.10.0'
+  s.add_dependency 'watir-webdriver', '>= 0.3.9'
+  s.add_dependency 'selenium-webdriver', '>= 2.12.2'
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '>= 1.1.0'

data/spec/page-object/page-object_spec.rb CHANGED Viewed

@@ -92,19 +92,22 @@ describe PageObject do
       end
       it "should override alert popup behavior" do
-        watir_browser.should_receive(:alert)
+        watir_browser.should_receive(:wd).twice.and_return(watir_browser)
+        watir_browser.should_receive(:execute_script).twice
         watir_page_object.alert do
         end
       end
       it "should override confirm popup behavior" do
-        watir_browser.should_receive(:confirm)
+        watir_browser.should_receive(:wd).twice.and_return(watir_browser)
+        watir_browser.should_receive(:execute_script).twice
         watir_page_object.confirm(true) do
         end
       end
       it "should override prompt popup behavior" do
-        watir_browser.should_receive(:prompt)
+        watir_browser.should_receive(:wd).twice.and_return(watir_browser)
+        watir_browser.should_receive(:execute_script).twice
         watir_page_object.prompt("blah") do
         end
       end

metadata CHANGED Viewed

@@ -2,7 +2,7 @@
 name: page-object
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jeff Morgan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00 Z
+date: 2011-11-18 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
@@ -31,7 +31,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.12.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency
@@ -98,6 +98,7 @@ files:
 - features/hidden_field.feature
 - features/html/frame_1.html
 - features/html/frame_2.html
+- features/html/frame_3.html
 - features/html/frames.html
 - features/html/iframes.html
 - features/html/images/circle.png
@@ -290,6 +291,7 @@ test_files:
 - features/hidden_field.feature
 - features/html/frame_1.html
 - features/html/frame_2.html
+- features/html/frame_3.html
 - features/html/frames.html
 - features/html/iframes.html
 - features/html/images/circle.png