page-object 0.4.1 → 0.4.2

data/ChangeLog

@@ -1,3 +1,8 @@
+=== Version 0.4.2 / 2011-10-01
+* Enhancements
+  * Proper handling of <button> elements
+  * Changed PageFactory so it also sets and instance variable @current_page to the newly created page
+
 === Version 0.4.1 / 2011-09-30
 * Fixes
   * Fixed error when loading plugins using Selenium

data/features/button.feature

@@ -28,6 +28,18 @@ Feature: Button
     | index     |
     | value     |
 
+  Scenario Outline: Locating real buttons on the page
+    When I search for the button by "<search_by>"
+    Then I should be able to click the real button
+
+  Scenarios:
+    | search_by |
+    | id        |
+    | class     |
+    | name      |
+    | index     |
+    | value     |
+
   @watir_only
   Scenario Outline: Locating buttons on Watir only
     When I search for the button by "<search_by>"
@@ -46,6 +58,16 @@ Feature: Button
     | class  | index  |
     | name   | index  |
     
+  Scenario Outline: Locating real button using multiple parameters
+    When I search for the button by "<param1>" and "<param2>"
+    Then I should be able to click the real button
+
+  Scenarios:
+    | param1 | param2 |
+    | class  | index  |
+    | name   | index  |
+
+
   Scenario: Finding a button dynamically
     When I find a button while the script is executing
     Then I should be able to click the button element

data/features/html/static_elements.html

@@ -47,6 +47,7 @@
 
     <form method="get" action="success.html">
         <input id='button_id' name='button_name' class='button_class' type="submit" value="Click Me">
+        <button type='button' id='btn_id' name='btn_name' class='btn_class'>Click Me Too</button>
     </form>
 
     <img src="images/circle.png" id="image_id" name="image_name" class="image_class">

data/features/step_definitions/button_steps.rb

@@ -14,6 +14,10 @@ Then /^I should be able to click the button$/ do
   @page.send "button_#{@how}"
 end
 
+Then /^I should be able to click the real button$/ do
+  @page.send "btn_#{@how}"
+end
+
 When /^I find a button while the script is executing$/ do
   @button = @page.button_element(:id => 'button_id')
 end

data/features/support/page.rb

@@ -124,6 +124,15 @@ class Page
   button(:button_class_index, :class => "button_class", :index => 0)
   button(:button_name_index, :name => "button_name", :index => 0)
 
+  button(:btn_id, :id => 'btn_id')
+  button(:btn_name, :name => 'btn_name')
+  button(:btn_class, :class => 'btn_class')
+  button(:btn_index, :index => 0)
+  button(:btn_text, :text => 'Click Me Too')
+  button(:btn_value, :value => 'Click Me Too')
+  button(:btn_class_index, :class => "btn_class", :index => 0)
+  button(:btn_name_index, :name => "btn_name", :index => 0)
+
   image(:image_id, :id => 'image_id')
   image(:image_name, :name => 'image_name')
   image(:image_class, :class => 'image_class')

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

@@ -84,8 +84,21 @@ module PageObject
       def self.build_xpath_for identifier
         tag_locator = identifier.delete(:tag_name)
         idx = identifier.delete(:index)
-        identifier.delete(:tag_name)
-        xpath = ".//#{tag_locator}"
+        if tag_locator == 'input' and identifier[:type] == 'submit'
+          identifier.delete(:type)
+          btn_ident = identifier.clone
+          if btn_ident[:value]
+            btn_ident[:text] = btn_ident[:value]
+            btn_ident.delete(:value)
+          end
+          xpath = ".//button"
+          xpath << "[#{attribute_expression(btn_ident)}]" unless btn_ident.empty?
+          xpath << "[#{idx+1}]" if idx
+          identifier[:type] = %w[button reset submit image]
+          xpath << " | .//input"
+        else
+          xpath = ".//#{tag_locator}"
+        end
         xpath << "[#{attribute_expression(identifier)}]" unless identifier.empty?
         xpath << "[#{idx+1}]" if idx
         xpath

data/lib/page-object/page_factory.rb

@@ -41,9 +41,9 @@ module PageObject
     # @return [PageObject] the newly created page object
     #
     def on_page(page_class, visit=false, &block)
-      page = page_class.new(@browser, visit)
-      block.call page if block
-      page
+      @current_page = page_class.new(@browser, visit)
+      block.call @current_page if block
+      @current_page
     end
 
   end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

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

@@ -29,7 +29,7 @@ describe "Element class methods" do
     end
 
     def all_input_elements
-      ['text', 'hidden', 'checkbox', 'radio', 'submit']
+      ['text', 'hidden', 'checkbox', 'radio']
     end
 
     it "should build xpath when index is provided for basic elements" do
@@ -46,7 +46,7 @@ describe "Element class methods" do
         identifier = {:tag_name => 'input', :type => tag, :index => 1}
         how, what = PageObject::Elements::Element.selenium_identifier_for identifier
         how.should == :xpath
-        what.should == ".//input[@type='#{tag}'][2]"
+        what.should include ".//input[@type='#{tag}'][2]"
       end
     end
 
@@ -64,7 +64,7 @@ describe "Element class methods" do
         identifier = {:tag_name => 'input', :type => "#{type}", :name => 'blah', :index => 0}
         how, what = PageObject::Elements::Element.selenium_identifier_for identifier
         how.should == :xpath
-        what.should == ".//input[@type='#{type}' and @name='blah'][1]"
+        what.should include ".//input[@type='#{type}' and @name='blah'][1]"
       end
     end
 
@@ -81,7 +81,7 @@ describe "Element class methods" do
       all_input_elements.each do |type|
         identifier = {:tag_name => 'input', :type => "#{type}", :name => 'foo', :class => 'bar'}
         how, what = PageObject::Elements::Element.selenium_identifier_for identifier
-        what.should == ".//input[@type='#{type}' and @name='foo' and @class='bar']"
+        what.should include ".//input[@type='#{type}' and @name='foo' and @class='bar']"
       end
     end
   end  

data/spec/page-object/page_factory_spec.rb

@@ -31,4 +31,10 @@ describe PageObject::PageFactory do
       page.should be_instance_of FactoryTestPageObject
     end
   end
+  
+  it "should set an instance variable that can be used outside of the block" do
+    page = @world.on_page FactoryTestPageObject
+    current_page = @world.instance_variable_get "@current_page"
+    current_page.should === page
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: page-object
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Jeff Morgan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-30 00:00:00 Z
+date: 2011-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: watir-webdriver