page-object 0.8.2 → 0.8.3

data/ChangeLog

@@ -1,3 +1,12 @@
+=== Version 0.8.3 / 2013-1-22
+* Enhancements
+  * Updated to use the latest selenium-webdriver 2.29
+  * Added :using_params parameter to both on_page and if_page methods
+* Fixes
+  * Fixed issue where has_expected_title? displays misleading error message (X Zhang)
+  * Fixed issue when getting basic Element element when using Selenium
+  * Fixed issue when using plural class methods multiple times on same object
+
 === Version 0.8.2 / 2013-1-13
 * Enhancements
   * Updated expected_element to ue the global default element wait by default

data/lib/page-object/accessors.rb

@@ -60,8 +60,9 @@ module PageObject
     #
     def expected_title(expected_title)
       define_method("has_expected_title?") do
-        has_expected_title = expected_title === title
-        raise "Expected title '#{expected_title}' instead of '#{title}'" unless has_expected_title
+        page_title = title
+        has_expected_title = (expected_title === page_title)
+        raise "Expected title '#{expected_title}' instead of '#{page_title}'" unless has_expected_title
         has_expected_title
       end
     end
@@ -1168,8 +1169,8 @@ module PageObject
       define_method(method_name) do |name, *identifier, &block|
         define_method("#{name}_elements") do
           return call_block(&block) unless block.nil?
-          method_name = (method_name == :checkboxes) ? 'checkboxs_for' : "#{method_name.to_s}_for"
-          platform.send method_name, identifier.first.clone
+          platform_method = (method_name == :checkboxes) ? 'checkboxs_for' : "#{method_name.to_s}_for"
+          platform.send platform_method, identifier.first.clone
         end
       end
     end

data/lib/page-object/page_factory.rb

@@ -38,15 +38,15 @@ module PageObject
     # Create and navigate to a page object.  The navigation will only work if the
     # 'page_url' method was call on the page object.
     #
-    # @param [PageObject, String] a class that has included the PageObject module or a string containing the name of the class 
+    # @param [PageObject, String] a class that has included the
+    # PageObject module or a string containing the name of the class
+    # @param Hash values that is pass through to page class a
+    # available in the @params instance variable.
     # @param an optional block to be called
     # @return [PageObject] the newly created page object
     #
     def visit_page(page_class, params={:using_params => {}}, &block)
-      page_class = class_from_string(page_class) if page_class.is_a? String
-      merged = page_class.params.merge(params[:using_params])
-      page_class.instance_variable_set("@merged_params", merged) unless merged.empty?
-      on_page page_class, true, &block
+      on_page page_class, params, true, &block
     end
 
     # Support 'visit' for readability of usage
@@ -56,12 +56,16 @@ module PageObject
     # Create a page object.
     #
     # @param [PageObject, String]  a class that has included the PageObject module or a string containing the name of the class
+    # @param Hash values that is pass through to page class a
+    # available in the @params instance variable.
     # @param [Boolean]  a boolean indicating if the page should be visited?  default is false.
     # @param [block]  an optional block to be called
     # @return [PageObject] the newly created page object
     #
-    def on_page(page_class, visit=false, &block)
+    def on_page(page_class, params={:using_params => {}}, visit=false, &block)
       page_class = class_from_string(page_class) if page_class.is_a? String
+      merged = page_class.params.merge(params[:using_params])
+      page_class.instance_variable_set("@merged_params", merged) unless merged.empty?
       @current_page = page_class.new(@browser, visit)
       block.call @current_page if block
       @current_page
@@ -74,13 +78,15 @@ module PageObject
     # Create a page object if and only if the current page is the same page to be created
     #
     # @param [PageObject, String]  a class that has included the PageObject module or a string containing the name of the class
+    # @param Hash values that is pass through to page class a
+    # available in the @params instance variable.
     # @param [block]  an optional block to be called
     # @return [PageObject] the newly created page object
     #
-    def if_page(page_class, &block)
+    def if_page(page_class, params={:using_params => {}},&block)
       page_class = class_from_string(page_class) if page_class.is_a? String
       return @current_page unless @current_page.class == page_class
-      on_page(page_class, false, &block)
+      on_page(page_class, params, false, &block)
     end
 
     # Support 'if' for readability of usage

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

@@ -977,7 +977,7 @@ module PageObject
         # See PageObject::Accessors#element
         #
         def element_for(tag, identifier)
-          find_selenium_element(identifier, Elements::FileField, tag.to_s)
+          find_selenium_element(identifier, Elements::Element, tag.to_s)
         end
 
         #
@@ -985,7 +985,7 @@ module PageObject
         # See PageObject::Accessors#elements
         #
         def elements_for(tag, identifier)
-          find_selenium_elements(identifier, Elements::FileField, tag.to_s)
+          find_selenium_elements(identifier, Elements::Element, tag.to_s)
         end
 
         private

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/page-object.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'watir-webdriver', '>= 0.6.2'
-  s.add_dependency 'selenium-webdriver', '>= 2.27.2'
+  s.add_dependency 'selenium-webdriver', '>= 2.29.0'
 
   s.add_development_dependency 'rspec', '>= 2.12.0'
   s.add_development_dependency 'cucumber', '>= 1.2.0'

data/spec/page-object/watir_accessors_spec.rb

@@ -188,7 +188,7 @@ describe PageObject::Accessors do
     end
 
     it "should raise error when it does not have expected title" do
-      watir_browser.should_receive(:title).twice.and_return("Not Expected")
+      watir_browser.should_receive(:title).once.and_return("Not Expected")
       expect { watir_page_object.has_expected_title? }.to raise_error
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.27.2
+        version: 2.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.27.2
+        version: 2.29.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -381,7 +381,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2877571143837407410
+      hash: -1401660757405095936
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -390,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2877571143837407410
+      hash: -1401660757405095936
 requirements: []
 rubyforge_project: page-object
 rubygems_version: 1.8.24