page-object 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c96b938e70722ef3112ed42848c96a2fd3dbf39
-  data.tar.gz: 15af3e8cc3af7f269dcacecf24d6f1b38fcb9f9e
+  metadata.gz: 386482bc19d329a8cd1189c91a689fca46fc9a8e
+  data.tar.gz: cb8e35e8ec52b8b5e776d9122ef7d7e02ce4e14d
 SHA512:
-  metadata.gz: 99435b3c59bac3889037dca32b76ef15c3f90472855e06e7ea06b816a91e0d7ea82c07edd8f026f3514b1e15739b15f5a6363df9d8bca7fc834eb104243b4df5
-  data.tar.gz: e760b232a4f41f862a719585061513902f3b345dd4cd40dba732dd77d4b427bf634fe85059fdcb3c38f150de65063d8d537d595695414b9c96cb1b59eb3e72da
+  metadata.gz: b061306394d35e32ca3c44a18b27ee3909c0d8cdd983debbe3d0e0307d55707bf2f4b2b8386cbef267f7becc2da53e83ff78e1e12d56f50f03d116ad552ffe89
+  data.tar.gz: e8373204c8b363185d094987ffa51e1d2518281b38ffddd6ebd868192e1fa48b07686a0829549db31223bc1086b376823c106c411cd90f33c10903a5897db749

data/.rspec

@@ -1,2 +1,2 @@
 --color 
---format Fuubar
+--format documentation

data/ChangeLog

@@ -1,3 +1,10 @@
+=== Version 1.0.1
+* 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
+* Fixes
+  * Added support for dynamically finding elements inside iframes (Thanks Justin Ko)
+
 === Version 1.0 / 2014-6-1
 * Enhancements
   * Better support for using Regexp

data/features/frames.feature

@@ -48,6 +48,11 @@ Feature: Handling frames
     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: Identifying items in iframes at runtime
+    Given I am on the iframe elements page
+    When I type "page-object" into the text field from iframe 1 identified dynamically
+    Then I should verify "page-object" in the text field for iframe 1 identified dynamically
+
   Scenario: Handling alerts inside frames
     Given I am on the frame elements page
     When I trigger an alert within a frame

data/features/step_definitions/element_steps.rb

@@ -220,7 +220,7 @@ end
 class DoubleClickPage
   include PageObject
   button(:click)
-  paragraph(:text)
+  paragraph(:p_text)
 end
 
 Given /^I am on the Double Click page$/ do
@@ -233,7 +233,7 @@ When /^I double click the button$/ do
 end
 
 Then /^the paragraph should read "([^\"]*)"$/ do |expected_text|
-  @page.text.should == expected_text
+  @page.p_text.should == expected_text
 end
 
 When /^I scroll the heading element into view$/ do

data/features/step_definitions/frames_steps.rb

@@ -119,6 +119,18 @@ Then /^I should verify "([^\"]*)" in the text field for frame 1 identified dynam
   end
 end
 
+When /^I type "([^\"]*)" into the text field from iframe 1 identified dynamically$/ do |value|
+  @page.in_iframe(:id => 'frame_one_1') do |frame|
+    @page.text_field_element(:name => 'senderElement', :frame => frame).value = value
+  end
+end
+
+Then /^I should verify "([^\"]*)" in the text field for iframe 1 identified dynamically$/ do |value|
+  @page.in_iframe(:id => 'frame_one_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_three_3') do |frame|
     @msg = @page.alert(frame) do

data/features/step_definitions/gxt_table_steps.rb

@@ -1,3 +1,13 @@
+
+def class_exists?(class_name)
+  begin
+    klass = Module.const_get(class_name)
+    return klass.is_a?(Class)
+  rescue NameError
+    return false
+  end
+end
+
 Given /^I am on the Gxt Examples page$/ do
   visit GxtSamplePageObject
 end
@@ -28,9 +38,9 @@ When /^I define a page-object using that widget$/ do
 
     page_url "http://gxtexamplegallery.appspot.com/"
 
-    div(:basic_grid, :class => "label_basic_grid")
+    div(:basic_grid, :class => "label_basic_grid") 
     gxt_table(:gxt_table, :class => "x-grid3")
-  end
+  end unless class_exists? 'GxtSamplePageObject'
 end
 
 When /^I have registered the GxtTable with PageObject$/ do

data/features/step_definitions/indexed_property_steps.rb

@@ -1,20 +1,24 @@
 class IndexedPropertyPage
   include PageObject
 
-  indexed_property :table, [[:text_field, :text, {:id => 'table[%s].text'}],
+  indexed_property :table, [[:text_field, :text_table, {:id => 'table[%s].text'}],
                             [:text_field, :text_name, {:name => 'tableName[%s].text'}],
                             [:radio_button, :radio, {:id => 'table[%s].radio'}],
                             [:checkbox, :check, {:id => 'table[%s].check'}],
                             [:text_area, :area, {:id => 'table[%s].area'}],
                             [:button, :button, {:id => 'table[%s].button'}]]
 
-  indexed_property :nottable, [[:text_field, :text, {:id => 'nottable[%s].text'}]]
+  indexed_property :nottable, [[:text_field, :text_nottable, {:id => 'nottable[%s].text'}]]
 
 end
 
+def page
+  @page ||= IndexedPropertyPage.new(@browser)
+end
+
 Given /^I am on the indexed property page$/ do
-  @page = IndexedPropertyPage.new(@browser)
-  @page.navigate_to(UrlHelper.indexed)
+#  @page = IndexedPropertyPage.new(@browser)
+  page.navigate_to(UrlHelper.indexed)
 end
 
 When /^I search for the elements for index "([^\"]*)"$/ do |index|
@@ -22,58 +26,58 @@ When /^I search for the elements for index "([^\"]*)"$/ do |index|
 end
 
 Then /^I type "([^\"]*)" into the table's indexed text field by id$/ do |val|
-  @page.table[@index].text = val
+  page.table[@index].text_table = val
 end
 
 Then /^The table's indexed text field by id should contain "([^\"]*)"$/ do |val|
-  @page.table[@index].text.should == val
+  page.table[@index].text_table.should == val
 end
 
 Then /^I type "([^\"]*)" into the table's indexed text field by name$/ do |val|
-  @page.table[@index].text_name = val
+  page.table[@index].text_name = val
 end
 
 Then /^The table's indexed text field by name should contain "([^\"]*)"$/ do |val|
-  @page.table[@index].text_name.should == val
+  page.table[@index].text_name.should == val
 end
 
 Then /^I select the indexed radio button$/ do
-  @page.table[@index].select_radio
+  page.table[@index].select_radio
 end
 
 Then /^The indexed radio button should be selected$/ do
-  @page.table[@index].radio_selected?.should == true
+  page.table[@index].radio_selected?.should == true
 end
 
 Then /^I check the indexed checkbox$/ do
-  @page.table[@index].check_check
+  page.table[@index].check_check
 end
 
 Then /^The indexed checkbox should be checked$/ do
-  @page.table[@index].check_checked?.should == true
+  page.table[@index].check_checked?.should == true
 end
 
 Then /^I type "([^\"]*)" into the table's indexed text area$/ do |val|
-  @page.table[@index].area = val
+  page.table[@index].area = val
 end
 
 Then /^The table's indexed text area should contain "([^\"]*)"$/ do |val|
-  @page.table[@index].area.should == val
+  page.table[@index].area.should == val
 end
 
 Then /^I should see that the indexed button exists$/ do
-  @page.table[@index].button?.should == true
+  page.table[@index].button?.should == true
 end
 
 Then /^I should be able to click the indexed button$/ do
-  @page.table[@index].button
+  page.table[@index].button
 end
 
 Then /^I type "([^\"]*)" into the regular indexed text field by id$/ do |val|
-  @page.nottable[@index].text = val
+  page.nottable[@index].text_nottable = val
 end
 
 Then /^The regular indexed text field by id should contain "([^\"]*)"$/ do |val|
-  @page.nottable[@index].text.should == val
+  page.nottable[@index].text_nottable.should == val
 end
 

data/features/support/page.rb

@@ -28,7 +28,6 @@ class Page
   text_area(:text_area_css, :css => ".text_area_class")
   text_area(:text_area_name, :name => "text_area_name")
   text_area(:text_area_xpath, :xpath => "//textarea")
-  text_area(:text_area_css, :css => "textarea")
   text_area(:text_area_tag_name, :tag_name => "textarea")
   text_area(:text_area_index, :index => 0)
   text_area(:text_area_text, :text => "")
@@ -42,7 +41,6 @@ class Page
   hidden_field(:hidden_field_css, :css => ".hidden_field_class")
   hidden_field(:hidden_field_name, :name => "hidden_field_name")
   hidden_field(:hidden_field_xpath, :xpath => "//input[@type='hidden']")
-  hidden_field(:hidden_field_css, :css => "input[type='hidden']")
   hidden_field(:hidden_field_tag_name, :tag_name => "input[type='hidden']")
   hidden_field(:hidden_field_index, :index => 0)
   hidden_field(:hidden_field_text, :text => "")
@@ -60,7 +58,6 @@ class Page
   link(:google_search_href, :href => "success.html")
   link(:google_search_text, :text => "Google Search")
   link(:google_search_index, :index => 0)
-  link(:google_search_css, :css => "a.link_class")
   link(:google_search_title, :title => "link_title")
 
   select_list(:sel_list_id, :id => "sel_list_id")
@@ -112,7 +109,6 @@ class Page
   div(:div_title, :title => 'div_title')
   div(:div_class_index, :class => "div_class", :index => 0)
   div(:div_name_index, :name => "div_name", :index => 0)
-  div(:div_css, :css => ".div_class")
   
   div(:div_data_entity, :data_entity => "test")
 
@@ -155,7 +151,6 @@ class Page
   button(:button_xpath, :xpath=> "//input[@type='submit']")
   button(:button_text, :text => 'Click Me')
   button(:button_value, :value => 'Click Me')
-  button(:button_css, :css => "input[type='submit']")
   button(:button_class_index, :class => "button_class", :index => 0)
   button(:button_name_index, :name => "button_name", :index => 0)
 

data/lib/page-object.rb

@@ -260,7 +260,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.
   #
@@ -281,6 +281,27 @@ module PageObject
     platform.in_frame(identifier, frame, &block)
   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_iframe by passing the frame to the next level.
+  #
+  # @example
+  #   in_iframe(:id => 'iframe_id') do |iframe|
+  #     text_field_element(:id => 'ifname', :frame => iframe)
+  #   end
+  #
+  # @param [Hash] identifier how we find the iframe.  The valid keys are:
+  #   * :id => Watir and Selenium
+  #   * :index => Watir and Selenium
+  #   * :name => Watir and Selenium
+  #   * :class => 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)
+    platform.in_iframe(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/accessors.rb

@@ -209,7 +209,8 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def text_field(name, identifier={:index => 0}, &block)
+    def text_field(name, identifier={:index => 0}, &block) 
+      standard_methods(name, identifier, 'text_field_for', &block)
       define_method(name) do
         return platform.text_field_value_for identifier.clone unless block_given?
         self.send("#{name}_element").value
@@ -218,7 +219,6 @@ module PageObject
         return platform.text_field_value_set(identifier.clone, value) unless block_given?
         self.send("#{name}_element").value = value
       end
-      standard_methods(name, identifier, 'text_field_for', &block)
     end
 
     #
@@ -244,11 +244,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def hidden_field(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'hidden_field_for', &block)
       define_method(name) do
         return platform.hidden_field_value_for identifier.clone unless block_given?
         self.send("#{name}_element").value
       end
-      standard_methods(name, identifier, 'hidden_field_for', &block)
     end
     alias_method :hidden, :hidden_field
 
@@ -275,6 +275,7 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def text_area(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'text_area_for', &block)
       define_method(name) do
         return platform.text_area_value_for identifier.clone unless block_given?
         self.send("#{name}_element").value
@@ -283,7 +284,6 @@ module PageObject
         return platform.text_area_value_set(identifier.clone, value) unless block_given?
         self.send("#{name}_element").value = value
       end
-      standard_methods(name, identifier, 'text_area_for', &block)
     end
     alias_method :textarea, :text_area
 
@@ -313,6 +313,7 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def select_list(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'select_list_for', &block)
       define_method(name) do
         return platform.select_list_value_for identifier.clone unless block_given?
         self.send("#{name}_element").value
@@ -321,13 +322,10 @@ module PageObject
         return platform.select_list_value_set(identifier.clone, value) unless block_given?
         self.send("#{name}_element").select(value)
       end
-
       define_method("#{name}_options") do
         element = self.send("#{name}_element")
         (element && element.options) ? element.options.collect(&:text) : []
       end
-
-      standard_methods(name, identifier, 'select_list_for', &block)
     end
     alias_method :select, :select_list
 
@@ -357,11 +355,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def link(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'link_for', &block)
       define_method(name) do
         return platform.click_link_for identifier.clone unless block_given?
         self.send("#{name}_element").click
       end
-      standard_methods(name, identifier, 'link_for', &block)
     end
     alias_method :a, :link
 
@@ -390,6 +388,7 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def checkbox(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'checkbox_for', &block)
       define_method("check_#{name}") do
         return platform.check_checkbox(identifier.clone) unless block_given?
         self.send("#{name}_element").check
@@ -402,7 +401,6 @@ module PageObject
         return platform.checkbox_checked?(identifier.clone) unless block_given?
         self.send("#{name}_element").checked?
       end
-      standard_methods(name, identifier, 'checkbox_for', &block)
     end
 
     #
@@ -431,6 +429,7 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def radio_button(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'radio_button_for', &block)
       define_method("select_#{name}") do
         return platform.select_radio(identifier.clone) unless block_given?
         self.send("#{name}_element").select
@@ -443,7 +442,6 @@ module PageObject
         return platform.radio_selected?(identifier.clone) unless block_given?
         self.send("#{name}_element").selected?
       end
-      standard_methods(name, identifier, 'radio_button_for', &block)
     end
     alias_method :radio, :radio_button
 
@@ -468,6 +466,7 @@ 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
@@ -521,11 +520,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def button(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'button_for', &block)
       define_method(name) do
         return platform.click_button_for identifier.clone unless block_given?
         self.send("#{name}_element").click
       end
-      standard_methods(name, identifier, 'button_for', &block)
     end
 
     #
@@ -550,11 +549,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def div(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'div_for', &block)
       define_method(name) do
         return platform.div_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'div_for', &block)
     end
 
     #
@@ -579,11 +578,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def span(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'span_for', &block)
       define_method(name) do
         return platform.span_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'span_for', &block)
     end
 
     #
@@ -608,11 +607,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def table(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'table_for', &block)
       define_method(name) do
         return platform.table_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'table_for', &block)
     end
 
     #
@@ -638,11 +637,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def cell(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'cell_for', &block)
       define_method("#{name}") do
         return platform.cell_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'cell_for', &block)
     end
     alias_method :td, :cell
 
@@ -717,11 +716,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def list_item(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'list_item_for', &block)
       define_method(name) do
         return platform.list_item_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'list_item_for', &block)
     end
     alias_method :li, :list_item
 
@@ -746,11 +745,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def unordered_list(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'unordered_list_for', &block)
       define_method(name) do
         return platform.unordered_list_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'unordered_list_for', &block)
     end
     alias_method :ul, :unordered_list
 
@@ -775,11 +774,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def ordered_list(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'ordered_list_for', &block)
       define_method(name) do
         return platform.ordered_list_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'ordered_list_for', &block)
     end
     alias_method :ol, :ordered_list
 
@@ -803,11 +802,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def h1(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier,'h1_for', &block)
       define_method(name) do
         return platform.h1_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier,'h1_for', &block)
     end
 
     #
@@ -830,11 +829,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def h2(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'h2_for', &block)
       define_method(name) do
         return platform.h2_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'h2_for', &block)
     end
 
     #
@@ -857,11 +856,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def h3(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'h3_for', &block)
       define_method(name) do
         return platform.h3_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'h3_for', &block)
     end
 
     #
@@ -884,11 +883,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def h4(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'h4_for', &block)
       define_method(name) do
         return platform.h4_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'h4_for', &block)
     end
 
     #
@@ -911,11 +910,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def h5(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'h5_for', &block)
       define_method(name) do
         return platform.h5_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'h5_for', &block)
     end
 
     #
@@ -938,11 +937,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def h6(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'h6_for', &block)
       define_method(name) do
         return platform.h6_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'h6_for', &block)
     end
 
     #
@@ -965,11 +964,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def paragraph(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'paragraph_for', &block)
       define_method(name) do
         return platform.paragraph_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'paragraph_for', &block)
     end
     alias_method :p, :paragraph
 
@@ -995,11 +994,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def file_field(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'file_field_for', &block)
       define_method("#{name}=") do |value|
         return platform.file_field_value_set(identifier.clone, value) unless block_given?
         self.send("#{name}_element").value = value
       end
-      standard_methods(name, identifier, 'file_field_for', &block)
     end
 
     #
@@ -1023,11 +1022,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def label(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'label_for', &block)
       define_method(name) do
         return platform.label_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
       end
-      standard_methods(name, identifier, 'label_for', &block)
     end
 
     #
@@ -1051,11 +1050,11 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def area(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'area_for', &block)
       define_method(name) do
         return platform.click_area_for identifier.clone unless block_given?
         self.send("#{name}_element").click
       end
-      standard_methods(name, identifier, 'area_for', &block)
     end
 
     #
@@ -1172,6 +1171,7 @@ 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,6 +1205,7 @@ 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)
@@ -1245,6 +1246,7 @@ 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)
@@ -1313,5 +1315,8 @@ module PageObject
       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/indexed_properties.rb

@@ -15,7 +15,7 @@ module PageObject
           how_and_what.each do |key, value|
             how_and_what[key] = value % index
           end
-          self.class.send type, name, how_and_what
+          self.class.send type, name, how_and_what unless self.class.instance_methods.include? name
         end
       end
     end
@@ -34,4 +34,4 @@ module PageObject
       end
     end
   end
-end
+end

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

@@ -941,32 +941,8 @@ module PageObject
  
         private
 
-        def move_element_to_css_selector(the_call, identifier)
-          valid_elements = %w(
-            area audio canvas div
-            h1 h2 h3 h4 h5 h6
-            label li p span td video
-          )
-          element = the_call.split('(').first
-          if identifier.keys.include?(:css) and valid_elements.include? element
-            the_call[element] = 'element'
-            selectors = identifier[:css].split(/,\s*/).map { |selector|
-              modified_selector = selector.split /\s+/
-              last = modified_selector.pop
-              if last.index(element) == 0
-                selector
-              else
-                modified_selector.push(element + last)
-              end
-            }
-            identifier[:css] = selectors.join(', ')
-          end
-          [the_call, identifier]
-        end
-    
         def find_watir_elements(the_call, type, identifier, tag_name=nil)
           identifier, frame_identifiers = parse_identifiers(identifier, type, tag_name)
-          the_call, identifier = move_element_to_css_selector(the_call, identifier)
           elements = @browser.instance_eval "#{nested_frames(frame_identifiers)}#{the_call}"
           switch_to_default_content(frame_identifiers)
           elements.map { |element| type.new(element, :platform => :watir_webdriver) }
@@ -974,7 +950,6 @@ module PageObject
 
         def find_watir_element(the_call, type, identifier, tag_name=nil)
           identifier, frame_identifiers = parse_identifiers(identifier, type, tag_name)
-          the_call, identifier = move_element_to_css_selector(the_call, identifier)
           element = @browser.instance_eval "#{nested_frames(frame_identifiers)}#{the_call}"
           switch_to_default_content(frame_identifiers)
           type.new(element, :platform => :watir_webdriver)
@@ -982,7 +957,6 @@ module PageObject
 
         def process_watir_call(the_call, type, identifier, value=nil, tag_name=nil)
           identifier, frame_identifiers = parse_identifiers(identifier, type, tag_name)
-          the_call, identifier = move_element_to_css_selector(the_call, identifier)
           value = @browser.instance_eval "#{nested_frames(frame_identifiers)}#{the_call}"
           switch_to_default_content(frame_identifiers)
           value

data/lib/page-object/version.rb

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

data/lib/page-object/widgets.rb

@@ -30,6 +30,7 @@ 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?

data/page-object.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'selenium-webdriver', '>= 2.42.0'
   s.add_dependency 'page_navigation', '>= 0.9'
 
-  s.add_development_dependency 'rspec', '>= 2.14.0'
+  s.add_development_dependency 'rspec', '< 3.0'
   s.add_development_dependency 'cucumber', '>= 1.3.0'
   s.add_development_dependency 'yard', '>= 0.7.2'
   s.add_development_dependency 'rack', '>= 1.0'

data/spec/page-object/accessors_spec.rb

@@ -0,0 +1,60 @@
+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

data/spec/page-object/selenium_accessors_spec.rb

@@ -17,7 +17,7 @@ class SeleniumAccessorsTestPageObject
   div(:message, :id => 'message_id')
   table(:cart, :id => 'cart_id')
   cell(:total, :id => 'total')
-  span(:alert, :id => 'alert_id')
+  span(:alert_span, :id => 'alert_id')
   image(:logo, :id => 'logo')
   form(:login, :id => 'login')
   list_item(:item_one, :id => 'one')
@@ -69,7 +69,7 @@ class SeleniumBlockPageObject
   div :footer do |element|
     "div"
   end
-  span :alert do |element|
+  span :alert_span do |element|
     "span"
   end
   table :cart do |element|
@@ -342,12 +342,12 @@ describe PageObject::Accessors do
     it "should retrieve the text from a span" do
       selenium_browser.should_receive(:find_element).and_return(selenium_browser)
       selenium_browser.should_receive(:text).and_return("Alert")
-      selenium_page_object.alert.should == "Alert"
+      selenium_page_object.alert_span.should == "Alert"
     end
 
     it "should retrieve the span element from the page" do
       selenium_browser.should_receive(:find_element).and_return(selenium_browser)
-      element = selenium_page_object.alert_element
+      element = selenium_page_object.alert_span_element
       element.should be_instance_of PageObject::Elements::Span
     end
   end

data/spec/page-object/watir_accessors_spec.rb

@@ -17,7 +17,7 @@ class WatirAccessorsTestPageObject
   div(:message, :id => 'message_id')
   table(:cart, :id => 'cart_id')
   cell(:total, :id => 'total')
-  span(:alert, :id => 'alert_id')
+  span(:alert_span, :id => 'alert_id')
   image(:logo, :id => 'logo')
   form(:login, :id => 'login')
   list_item(:item_one, :id => 'one')
@@ -69,7 +69,7 @@ class WatirBlockPageObject
   div :footer do |element|
     "div"
   end
-  span :alert do |element|
+  span :alert_span do |element|
     "span"
   end
   table :cart do |element|
@@ -687,24 +687,24 @@ describe PageObject::Accessors do
   describe "span accessors" do
     context "when called on a page object" do
       it "should generate accessor methods" do
-        watir_page_object.should respond_to(:alert)
-        watir_page_object.should respond_to(:alert_element)
+        watir_page_object.should respond_to(:alert_span)
+        watir_page_object.should respond_to(:alert_span_element)
       end
 
       it "should call a block on the element method when present" do
-        block_page_object.alert_element.should == "span"
+        block_page_object.alert_span_element.should == "span"
       end
     end
 
     it "should retrieve the text from a span" do
       watir_browser.should_receive(:span).and_return(watir_browser)
       watir_browser.should_receive(:text).and_return("Alert")
-      watir_page_object.alert.should == "Alert"
+      watir_page_object.alert_span.should == "Alert"
     end
 
     it "should retrieve the span element from the page" do
       watir_browser.should_receive(:span).and_return(watir_browser)
-      element = watir_page_object.alert_element
+      element = watir_page_object.alert_span_element
       element.should be_instance_of PageObject::Elements::Span
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeff Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -330,6 +330,7 @@ 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
@@ -518,6 +519,7 @@ 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