page-object 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 386482bc19d329a8cd1189c91a689fca46fc9a8e
-  data.tar.gz: cb8e35e8ec52b8b5e776d9122ef7d7e02ce4e14d
+  metadata.gz: 8826d6f078421cd039c214d90e20423cb348a223
+  data.tar.gz: c17ebadedafc8bd8ef1ad9f9cfc040378d341cc4
 SHA512:
-  metadata.gz: b061306394d35e32ca3c44a18b27ee3909c0d8cdd983debbe3d0e0307d55707bf2f4b2b8386cbef267f7becc2da53e83ff78e1e12d56f50f03d116ad552ffe89
-  data.tar.gz: e8373204c8b363185d094987ffa51e1d2518281b38ffddd6ebd868192e1fa48b07686a0829549db31223bc1086b376823c106c411cd90f33c10903a5897db749
+  metadata.gz: 914761fe9b6dcdc4db770bdc2b25e16f616fb9162635037539a8405f887695c4cb3c084c54d3447647a70872e17d1015482d842b1d14ad7ec05dcfb10421f218
+  data.tar.gz: 9a24a8127ba2f34183d77018ca89df9ccb7d0c7ed528fcee0040e8712060bbe6823387bdd3d2514d2fbde25e7b2f2c54867325d5898fc7ae829fe90fe4d63306

data/ChangeLog

@@ -1,4 +1,10 @@
-=== Version 1.0.1
+=== Version 1.0.2 / 2014-7-21
+* Enhancements
+  * Added support to use multiple identifiers when locating nested frames / iframes (Thanks Justin Ko)
+* Fixes
+  * Reverted the method name check due to unintended consequences
+
+=== Version 1.0.1 / 2014-7-19
 * Enhancements
   * Checks the name of generated methods to ensure they do not colide with existing page-object methods
   * Removed old legacy css code and now delegate everything to Watir

data/features/frames.feature

@@ -11,11 +11,17 @@ Feature: Handling frames
     #And I should be able to get the text fields text from frame 2 using "index"
 
 @watir_only    
-  Scenario: Accessing elements withing the frame using Regexp
+  Scenario: Accessing elements within the frame using Regexp
     Given I am on the frame elements page
     When I type "page-object" into the text field for frame 2 using "regex"
     Then I should verify "page-object" is in the text field for frame 2 using "regex"
 
+@watir_only    
+  Scenario: Accessing elements within the frame using multiple identifiers
+    Given I am on the iframe elements page
+    When I type "page-object" into the text field for frame 2 using "multiple identifiers"
+    Then I should verify "page-object" is in the text field for frame 2 using "multiple identifiers"
+
   Scenario: Switching between frames
     Given I am on the frame elements page
     When I type "page-object" into the text field for frame 2 using "id"

data/features/step_definitions/frames_steps.rb

@@ -52,6 +52,9 @@ class IFramePage
     text_field(:text_field_1_index, :name => 'senderElement', :frame => frame)
   end
 
+  in_iframe(:class => 'iframe', :name => 'frame2') do |frame|
+    text_field(:text_field_2_multiple_identifiers, :name => 'recieverElement', :frame => frame)      
+  end
 end
 
 
@@ -66,11 +69,11 @@ Given /^I am on the iframe elements page$/ do
 end
 
 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
+  @page.send "text_field_2_#{arg_type.gsub(' ', '_')}=".to_sym, text
 end
 
 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 = @page.send "text_field_2_#{arg_type.gsub(' ', '_')}".to_sym
   result.should == text
 end
 
@@ -79,11 +82,11 @@ end
 #end
 
 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
+  @page.send "text_field_1_#{arg_type.gsub(' ', '_')}=".to_sym, text
 end
 
 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 = @page.send "text_field_1_#{arg_type.gsub(' ', '_')}".to_sym
   result.should == text
 end
 

data/features/support/env.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../', 'lib'))
 
-require 'rspec/expectations'
+require 'rspec'
 require 'watir-webdriver'
 require 'selenium-webdriver'
 require 'page-object'

data/lib/page-object/accessors.rb

@@ -466,7 +466,6 @@ module PageObject
     # * :name => Watir and Selenium
     #
     def radio_button_group(name, identifier)
-      check_name(name)
       define_method("select_#{name}") do |value|
         platform.radio_buttons_for(identifier.clone).each do |radio_elem|
           if radio_elem.value == value
@@ -1171,7 +1170,6 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def element(name, tag, identifier={:index => 0}, &block)
-      check_name(name)
       define_method("#{name}") do
         self.send("#{name}_element").text
       end
@@ -1205,7 +1203,6 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def elements(name, tag, identifier={:index => 0}, &block)
-      check_name(name)
       define_method("#{name}_elements") do
         return call_block(&block) if block_given?
         platform.elements_for(tag, identifier.clone)
@@ -1246,7 +1243,6 @@ module PageObject
     end
 
     def standard_methods(name, identifier, method, &block)
-      check_name(name)
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
         platform.send(method, identifier.clone)
@@ -1314,9 +1310,5 @@ module PageObject
         end
       end
     end
-
-    def check_name(name)
-      raise NameError, "Identifier '#{name}' conflicts with page-object method of the same name" if self.instance_methods.include? name
-    end
   end
 end

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

@@ -34,7 +34,7 @@ module PageObject
         end
 
         #
-        # Return an array of Options contained in the select lit.
+        # Return an array of Options contained in the select list.
         #
         # @return [array of PageObject::Elements::Option]
         def options

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

@@ -974,24 +974,26 @@ module PageObject
           identifier[:tag_name] = tag if identifier[:name]
           identifier
         end
-    
+
         def nested_frames(frame_identifiers)
           return if frame_identifiers.nil?
           frame_str = ''
           frame_identifiers.each do |frame|
-            id = frame.values.first
             type = frame.keys.first
-            value = id.values.first
-            if value.is_a?(Regexp)
-              frame_str += "#{type.to_s}(:#{id.keys.first} => #{value.inspect})."
-            else
-              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
+            identifier = frame.values.first.map do |key, value|
+              if value.is_a?(Regexp)
+                ":#{key} => #{value.inspect}"
+              elsif value.to_s.is_integer
+                ":#{key} => #{value}"
+              else
+                ":#{key} => '#{value}'"
+              end
+            end.join(', ')
+            frame_str += "#{type.to_s}(#{identifier})."
           end
           frame_str
         end
-        
+
         def switch_to_default_content(frame_identifiers)
           @browser.wd.switch_to.default_content unless frame_identifiers.nil?          
         end

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

@@ -29,7 +29,7 @@ module PageObject
         end
 
         #
-        # Return an array of Options contained in the select lit.
+        # Return an array of Options contained in the select list.
         #
         # @return [array of PageObject::Elements::Option]
         #

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/page-object/widgets.rb

@@ -30,7 +30,6 @@ module PageObject
     def self.define_accessors(base, widget_tag, widget_class)
       accessors_module = Module.new do
         define_method widget_tag do |name, *identifier_args, &block|
-          check_name(name)
           
           identifier = identifier_args.first
           identifier = {:index => 0} if identifier.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jeff Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -330,7 +330,6 @@ files:
 - lib/page-object/widgets.rb
 - page-object.gemspec
 - pageobject.gems
-- spec/page-object/accessors_spec.rb
 - spec/page-object/element_locators_spec.rb
 - spec/page-object/elements/area_spec.rb
 - spec/page-object/elements/button_spec.rb
@@ -519,7 +518,6 @@ test_files:
 - features/text_field.feature
 - features/unordered_list.feature
 - features/video.feature
-- spec/page-object/accessors_spec.rb
 - spec/page-object/element_locators_spec.rb
 - spec/page-object/elements/area_spec.rb
 - spec/page-object/elements/button_spec.rb

data/spec/page-object/accessors_spec.rb

@@ -1,60 +0,0 @@
-require 'spec_helper'
-
-include RSpec::Matchers
-
-describe PageObject::Accessors do
-  context 'when declaring new elements on the page' do
-    
-    it "should check the name when adding an element" do
-        class TestPage
-          include PageObject
-
-          def self.elements
-            [
-             'text_field',
-             'hidden_field',
-             'text_area',
-             'select_list',
-             'link',
-             'checkbox',
-             'radio_button',
-             'radio_button_group',
-             'button',
-             'div',
-             'span',
-             'table',
-             'cell',
-             'image',
-             'form',
-             'list_item',
-             'unordered_list',
-             'ordered_list',
-             'h1',
-             'h2',
-             'h3',
-             'h4',
-             'h5',
-             'h6',
-             'paragraph',
-             'file_field',
-             'label',
-             'area',
-             'canvas',
-             'audio',
-             'video',
-             'svg',
-             'address',
-             'figure'
-            ]
-          end
-          
-          elements.each do |ele|
-            expect {
-              self.send ele, :platform, :id => 'foo'
-            }.to raise_error(NameError, "Identifier \'platform\' conflicts with page-object method of the same name")
-          end
-        end
-    end
-    
-  end
-end