page-object 0.7.3 → 0.7.4

data/ChangeLog

@@ -1,3 +1,10 @@
+=== Version 0.7.4 / 2012-9-8
+* Enhancements
+  * Added ability to find text_fields with :css when using Selenium
+  * Added selected_values method to SelectList to get values of all selected elements
+* Fixes
+  * Fixed problem getting value from SelectList when it is in a Frame with Selenium
+
 === Version 0.7.3 / 2012-8-18
 * Enhancements
   * Improved handling of alert and confirm Javascript popups (George Shakhnazaryan)

data/features/element.feature

@@ -282,7 +282,6 @@ Feature: Elements
     When I retrieve a button element
     Then I should be able to flash it
     
-  @focus
   Scenario: Getting an element's id
     When I retrieve a button element
     Then I should know its id is "button_id"

data/features/page_level_actions.feature

@@ -31,6 +31,10 @@ Feature: Page level actions
     When I handle the alert
     Then I should be able to get the alert's message
 
+  Scenario: Handling possible alert popups
+    When I handle the possible alert
+    Then I should be able to verify the popup didn't have a message
+
   Scenario: Handling alert popups that reload the page
     When I handle the alert that reloads the page
     Then I should be able to get the alert's message
@@ -39,6 +43,10 @@ Feature: Page level actions
     When I handle the confirm
     Then I should be able to get the confirm message
 
+  Scenario: Handling possible confirm popups
+    When I handle the possible confirm
+    Then I should be able to verify the popup didn't have a message
+
   Scenario: Handling confirm popups that reload the page
     When I handle the confirm that reloads the page
     Then I should be able to get the confirm message
@@ -46,6 +54,10 @@ Feature: Page level actions
   Scenario: Handling prompt popups
     When I handle the prompt
     Then I should be able to get the message and default value
+
+  Scenario: Handling possible prompt popups
+    When I handle the possible prompt
+    Then I should be able to verify the popup didn't have a message
     
   Scenario: Attach to window using title
     When I open a second window

data/features/select_list.feature

@@ -64,3 +64,7 @@ Feature: Select List
   Scenario: Selecting an option by its value
     When I select an option using the value "option2"
     Then the selected option should be "Test 2"
+    
+  Scenario: Getting the value from a selected option
+    When I select an option using the value "option2"
+    Then the selected option should have a value of "option2"

data/features/step_definitions/page_level_actions_steps.rb

@@ -23,6 +23,12 @@ When /^I handle the alert$/ do
   end
 end
 
+When /^I handle the possible alert$/ do
+  @msg = @page.alert do
+    @page.alert_button_element.focus
+  end
+end
+
 When /^I handle the alert that reloads the page$/ do
   @msg = @page.alert do
     @page.alert_button_that_reloads
@@ -33,12 +39,22 @@ Then /^I should be able to get the alert\'s message$/ do
   @msg.should == "I am an alert"
 end
 
+Then /^I should be able to verify the popup didn\'t have a message$/ do
+  @msg.should be_nil
+end
+
 When /^I handle the confirm$/ do
   @msg = @page.confirm(true) do
     @page.confirm_button
   end
 end
 
+When /^I handle the possible confirm$/ do
+  @msg = @page.confirm(true) do
+    @page.confirm_button_element.focus
+  end
+end
+
 When /^I handle the confirm that reloads the page$/ do
   @msg = @page.confirm(true) do
     @page.confirm_button_that_reloads
@@ -55,6 +71,12 @@ When /^I handle the prompt$/ do
   end
 end
 
+When /^I handle the possible prompt$/ do
+  @msg = @page.prompt("Cheezy") do
+    @page.prompt_button_element.focus
+  end
+end
+
 Then /^I should be able to get the message and default value$/ do
   @msg[:message].should == "enter your name"
   @msg[:default_value].should == 'John Doe'

data/features/step_definitions/select_list_steps.rb

@@ -59,3 +59,7 @@ end
 When /^I select an option using the value "([^\"]*)"$/ do |value|
   @page.sel_list_id_element.select_value(value)
 end
+
+Then /^the selected option should have a value of "([^\"]*)"$/ do |value|
+  @page.sel_list_id_element.selected_values[0].should == value
+end

data/features/text_field.feature

@@ -25,6 +25,16 @@ Feature: Text Fields
     | text      |
     | label     |
 
+  @selenium_only
+  Scenario Outline: Locating text fields on the Page using Selenium
+    When I search for the text field by "<search_by>"
+    Then I should be able to type "I found it" into the field
+
+  Examples:
+    | search_by |
+    | css       |
+
+
   Scenario Outline: Locating a text field using multiple parameters
     When I search for the text field by "<param1>" and "<param2>"
     Then I should be able to type "I found it" into the field

data/lib/page-object/accessors.rb

@@ -97,6 +97,7 @@ module PageObject
     # @param [Hash] identifier how we find a text field.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
+    #   * :css => Selenium only
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :label => Watir and Selenium

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

@@ -19,7 +19,7 @@ module PageObject
       end
 
       def self.selenium_finders
-        super + [:title, :value, :text, :label]
+        super + [:title, :value, :text, :label, :css]
       end
 
       def include_platform_for platform

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

@@ -71,9 +71,12 @@ module PageObject
         #
         def alert(frame=nil, &block)
           yield
-          alert = @browser.switch_to.alert
-          value = alert.text
-          alert.accept
+          begin
+            alert = @browser.switch_to.alert
+            value = alert.text
+            alert.accept
+          rescue Selenium::WebDriver::Error::NoAlertPresentError
+          end
           value
         end
 
@@ -83,9 +86,12 @@ module PageObject
         #
         def confirm(response, frame=nil, &block)
           yield
-          alert = @browser.switch_to.alert
-          value = alert.text
-          response ? alert.accept : alert.dismiss
+          begin
+            alert = @browser.switch_to.alert
+            value = alert.text
+            response ? alert.accept : alert.dismiss
+          rescue Selenium::WebDriver::Error::NoAlertPresentError
+          end
           value
         end
 
@@ -291,9 +297,13 @@ module PageObject
         #
         def select_list_value_for(identifier)
           process_selenium_call(identifier, Elements::SelectList, 'select') do |how, what|
+            selected = nil
             @browser.find_element(how, what).find_elements(:tag_name => 'option').each do |o|
-              return o.text if o.selected?
+              if selected.nil?
+                selected = o.text if o.selected?
+              end
             end
+            selected
           end
         end
 

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

@@ -42,12 +42,19 @@ module PageObject
         end
 
         #
-        # @return [Array<String>] An array of strings representing the text value of the currently selected options.
+        # @return [Array<String>] An array of strings representing the text of the currently selected options.
         #
         def selected_options
           find_options.map { |e| e.text if e.selected? }.compact
         end
 
+        #
+        # @return [Array<String>] An array of strings representing the value of the currently selected options.
+        #
+        def selected_values
+          find_options.map { |e| e.attribute('value') if e.selected? }.compact
+        end
+
         #
         # Returns true if the select list has one or more options where text or label matches the given value.
         #

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

@@ -72,8 +72,11 @@ module PageObject
         def alert(frame=nil, &block)
           switch_to_frame(frame)
           yield
-          value = @browser.alert.text
-          @browser.alert.ok
+          value = nil
+          if @browser.alert.exists?
+            value = @browser.alert.text
+            @browser.alert.ok
+          end
           switch_to_default_content(frame)
           value
         end
@@ -85,8 +88,11 @@ module PageObject
         def confirm(response, frame=nil, &block)
           switch_to_frame(frame)
           yield
-          value = @browser.alert.text
-          response ? @browser.alert.ok : @browser.alert.close
+          value = nil
+          if @browser.alert.exists?
+            value = @browser.alert.text
+            response ? @browser.alert.ok : @browser.alert.close
+          end
           switch_to_default_content(frame)
           value
         end

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

@@ -43,12 +43,20 @@ module PageObject
         end
 
         #
-        # @return [Array<String>] An array of strings representing the text value of the currently selected options.
+        # @return [Array<String>] An array of strings representing the text of the currently selected options.
         #
         def selected_options
           element.selected_options.map { |e| e.text }.compact
         end
 
+        #
+        # @return [Array<String>] An array of strings representing the value of the currently selected options.
+        #
+        def selected_values
+          element.selected_options.map { |e| e.value }.compact
+        end
+
+
         #
         # Returns true if the select list has one or more options where text or label matches the given value.
         #

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

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

@@ -67,6 +67,12 @@ describe PageObject::Elements::SelectList do
         sel_list.stub(:selected?).with('blah').and_return(true)
         watir_sel_list.selected?('blah')
       end
+
+      it "should be able to get the value for the selected options" do
+        sel_list.stub(:selected_options).and_return(opts)
+        sel_list.stub(:value).and_return(sel_list)
+        watir_sel_list.selected_values.should == opts
+      end
     end
 
     context "for selenium"  do
@@ -100,6 +106,16 @@ describe PageObject::Elements::SelectList do
         selected[0].should == 'test1'
       end
 
+      it "should return an array of selected options" do
+        sel_list.should_receive(:find_elements).with(:xpath, ".//child::option").and_return(opts)
+        opts[0].should_receive(:selected?).and_return(true)
+        opts[0].should_receive(:attribute).and_return('test1')
+        opts[1].should_receive(:selected?).and_return(false)
+        selected = selenium_sel_list.selected_values
+        selected.size.should == 1
+        selected[0].should == 'test1'
+      end
+
       it "should know if it includes some value" do
         sel_list.should_receive(:find_elements).and_return(opts)
         opts[0].should_receive(:text).and_return('blah')

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

@@ -123,7 +123,8 @@ describe PageObject do
       end
 
       it "should override alert popup behavior" do
-        watir_browser.should_receive(:alert).twice.and_return(watir_browser)
+        watir_browser.should_receive(:alert).exactly(3).times.and_return(watir_browser)
+        watir_browser.should_receive(:exists?).and_return(true)
         watir_browser.should_receive(:text)
         watir_browser.should_receive(:ok)
         watir_page_object.alert do
@@ -131,7 +132,8 @@ describe PageObject do
       end
 
       it "should override confirm popup behavior" do
-        watir_browser.should_receive(:alert).twice.and_return(watir_browser)
+        watir_browser.should_receive(:alert).exactly(3).times.and_return(watir_browser)
+        watir_browser.should_receive(:exists?).and_return(true)
         watir_browser.should_receive(:text)
         watir_browser.should_receive(:ok)
         watir_page_object.confirm(true) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2012-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -370,7 +370,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2357863127966397985
+      hash: -734083501090794232
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -379,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2357863127966397985
+      hash: -734083501090794232
 requirements: []
 rubyforge_project: page-object
 rubygems_version: 1.8.24