RubyGems - page-object - Versions diffs - 0.6.5 → 0.6.6 - Mend

page-object 0.6.5 → 0.6.6

Files changed (18) hide show

data/ChangeLog +9 -0
data/features/async.feature +5 -0
data/features/html/async.html +9 -1
data/features/html/static_elements.html +1 -1
data/features/span.feature +1 -0
data/features/step_definitions/async_steps.rb +10 -0
data/features/support/page.rb +1 -0
data/lib/page-object/elements/span.rb +2 -2
data/lib/page-object/platforms/selenium_webdriver/page_object.rb +18 -1
data/lib/page-object/platforms/selenium_webdriver/surrogate_selenium_element.rb +42 -0
data/lib/page-object/version.rb +1 -1
data/lib/page-object.rb +1 -1
data/page-object.gemspec +2 -2
data/spec/page-object/elements/span_spec.rb +2 -2
data/spec/page-object/page_populator_spec.rb +8 -7
data/spec/page-object/platforms/selenium_webdriver/selenium_page_object_spec.rb +29 -1
metadata +17 -17
data/lib/page-object/platforms/selenium_webdriver/null_selenium_element.rb +0 -28

data/ChangeLog CHANGED Viewed

@@ -1,3 +1,12 @@
+=== Version 0.6.6 / 2012-4-26
+* Enhancements
+  * Added ability to find span's by title
+  * Changed order of initialization so initialize_page is called after goto
+  * Updated to use watir-webdriver 0.5.5
+  * Updated to use selenium-webdriver 2.21.2
+* Fixes
+  * Fixed the problem with determining the existance of an Selenium element
 === Version 0.6.5 / 2012-4-12
 * Enhancements
   * Added a page level element method to return a generic Element object

data/features/async.feature CHANGED Viewed

@@ -16,3 +16,8 @@ Feature: Handling Asynch calls
   Scenario: Wait until something is not visible
     Given I am on the async elements page
     Then I should be able to wait until the button becomes invisible
+  Scenario: Wait for an element to appear on the page
+    Given I am on the async elements page
+    When I add a button a few seconds from now
+    Then I should be able to click it when it gets added

data/features/html/async.html CHANGED Viewed

@@ -9,12 +9,20 @@
       function hide() {
         document.getElementById("target").style.display="none";
       }
-    </script>
+      function addDiv() {
+        var button = document.createElement("input");
+        button.setAttribute("type", "button");
+        button.setAttribute("value", "New Button")
+        document.body.appendChild(button);
+      }
+     </script>
   </head>
   <body>
     <input type="button" id="target" value="Target"/>
     <input type="button" onclick="setTimeout(function() {hide();}, 2000);" value="Hide Button"/>
     <input type="button" onclick="setTimeout(function() {unhide();}, 2000);" value="Unhide Button"/>
+    <input type="button" onclick="setTimeout(function() {addDiv();}, 2000);" value="Create Button"/>
   </body>
 </html>

data/features/html/static_elements.html CHANGED Viewed

@@ -30,7 +30,7 @@
         page-object rocks!
     </div>
-    <span id="span_id" name="span_name" class="span_class">
+    <span id="span_id" name="span_name" class="span_class" title="span_title">
       My alert
     </span>

data/features/span.feature CHANGED Viewed

@@ -19,6 +19,7 @@ Feature: Span
     | index     |
     | name      |
     | text      |
+    | title     |
   Scenario Outline: Locating span using multiple parameters
     When I search for the span by "<param1>" and "<param2>"

data/features/step_definitions/async_steps.rb CHANGED Viewed

@@ -35,6 +35,8 @@ class AsyncPage
   button(:target, :value => 'Target')
   button(:hide, :value => 'Hide Button')
   button(:unhide, :value => 'Unhide Button')
+  button(:create_button, :value => 'Create Button')
+  button(:created_button, :value => 'New Button')
 end
 Given /^I am on the async elements page$/ do
@@ -60,3 +62,11 @@ Then /^I should be able to wait until the button becomes invisible$/ do
     @page.target_element.attribute("block").should == "none"
   end
 end
+When /^I add a button a few seconds from now$/ do
+  @page.create_button
+end
+Then /^I should be able to click it when it gets added$/ do
+  @page.created_button_element.when_present.click
+end

data/features/support/page.rb CHANGED Viewed

@@ -100,6 +100,7 @@ class Page
   span(:span_class, :class => 'span_class')
   span(:span_index, :index => 0)
   span(:span_text, :text => 'My alert')
+  span(:span_title, :title => 'span_title')
   span(:span_xpath, :xpath => '//span')
   span(:span_class_index, :class => "span_class", :index => 0)
   span(:span_name_index, :name => "span_name", :index => 0)

data/lib/page-object/elements/span.rb CHANGED Viewed

@@ -5,11 +5,11 @@ module PageObject
       protected
       def self.watir_finders
-        [:class, :id, :index, :text, :xpath]
+        [:class, :id, :index, :text, :title, :xpath]
       end
       def self.selenium_finders
-        [:class, :id, :name, :text, :xpath, :index]
+        [:class, :id, :name, :text, :title, :xpath, :index]
       end
     end

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

@@ -1,5 +1,6 @@
 require 'page-object/elements'
 require 'page-object/core_ext/string'
+require 'page-object/platforms/selenium_webdriver/surrogate_selenium_element'
 module PageObject
   module Platforms
@@ -886,7 +887,12 @@ module PageObject
         def find_selenium_element(identifier, type, tag, other=nil)
           how, what, frame_identifiers = parse_identifiers(identifier, type, tag, other)
           switch_to_frame(frame_identifiers)
-          element = @browser.find_element(how, what)
+          begin
+            element = @browser.find_element(how, what)
+          rescue Selenium::WebDriver::Error::NoSuchElementError
+            @browser.switch_to.default_content unless frame_identifiers.nil?
+            return build_null_object(identifier, type, tag, other)
+          end
           @browser.switch_to.default_content unless frame_identifiers.nil?
           type.new(element, :platform => :selenium_webdriver)
         end
@@ -899,6 +905,16 @@ module PageObject
           elements.map { |element| type.new(element, :platform => :selenium_webdriver) }
         end
+        def build_null_object(identifier, type, tag, other)
+          null_element = SurrogateSeleniumElement.new
+          null_element.identifier = identifier
+          null_element.type = type
+          null_element.tag = tag
+          null_element.other = other
+          null_element.platform = self
+          Elements::Element.new(null_element, :platform => :selenium_webdriver)
+        end
         def parse_identifiers(identifier, element, tag_name=nil, additional=nil)
           frame_identifiers = identifier.delete(:frame)
           identifier = add_tagname_if_needed identifier, tag_name, additional if tag_name
@@ -932,6 +948,7 @@ module PageObject
           return false if identifier[:text] and ['div', 'span', 'td', 'label'].include? tag
           return false if identifier[:title] and tag == 'input' and additional[:type] == 'text'
           return false if identifier[:title] and tag == 'input' and additional[:type] == 'file'
+          return false if identifier[:title] and tag == 'span'
           return false if identifier[:value] and tag == 'input' and
             ['radio', 'submit', 'image', 'button', 'reset', 'checkbox', 'hidden'].include? additional[:type]
           true

data/lib/page-object/platforms/selenium_webdriver/surrogate_selenium_element.rb ADDED Viewed

@@ -0,0 +1,42 @@
+module PageObject
+  module Platforms
+    module SeleniumWebDriver
+      class SurrogateSeleniumElement
+        attr_accessor :identifier, :type, :tag, :other, :platform
+        def exists?
+          attempt_to_find_element unless @element
+          @element ? (not @element.element.nil?) : false
+        end
+        def visible?
+          attempt_to_find_element unless @element
+          @element ? @element.element.displayed? : false
+        end
+        def nil?
+          attempt_to_find_element unless @element
+          @element ? @element.element.nil? : true
+        end
+        def displayed?
+          attempt_to_find_element unless @element
+          @element ? @element.element.displayed? : false
+        end
+        def method_missing(meth, *args)
+          return @element.send(meth, *args) if @element
+          $stderr.puts "You are calling #{meth} on an element that does not yet exist."
+          raise Selenium::WebDriver::Error::NoSuchElementError
+        end
+        private
+        def attempt_to_find_element
+          @element = platform.send(:find_selenium_element, identifier, type, tag, other) unless @element
+          @element = nil if @element.element.instance_of?(::PageObject::Platforms::SeleniumWebDriver::SurrogateSeleniumElement)
+        end
+      end
+    end
+  end
+end

data/lib/page-object/version.rb CHANGED Viewed

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/lib/page-object.rb CHANGED Viewed

@@ -55,8 +55,8 @@ module PageObject
   def initialize(browser, visit=false)
     @browser = browser
     include_platform_driver(browser)
-    initialize_page if respond_to?(:initialize_page)
     goto if visit && respond_to?(:goto)
+    initialize_page if respond_to?(:initialize_page)
   end
   # @private

data/page-object.gemspec CHANGED Viewed

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency 'watir-webdriver', '>= 0.5.4'
-  s.add_dependency 'selenium-webdriver', '>= 2.21.0'
+  s.add_dependency 'watir-webdriver', '>= 0.5.5'
+  s.add_dependency 'selenium-webdriver', '>= 2.21.2'
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '>= 1.1.0'

data/spec/page-object/elements/span_spec.rb CHANGED Viewed

@@ -6,14 +6,14 @@ describe PageObject::Elements::Span do
   describe "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :id, :index, :text, :xpath].each do |t|
+      [:class, :id, :index, :text, :title, :xpath].each do |t|
         identifier = span.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
     end
     it "should map selenium types to same" do
-      [:class, :id, :index, :name, :text, :xpath].each do |t|
+      [:class, :id, :index, :name, :text, :title, :xpath].each do |t|
         key, value = span.selenium_identifier_for t => 'value'
         key.should == t
       end

data/spec/page-object/page_populator_spec.rb CHANGED Viewed

@@ -21,11 +21,18 @@ describe PageObject::PagePopulator  do
     page_object.populate_page_with('tf' => 'value')
   end
-  it "should not set a value if it is not found on the page" do
+  it "should not set a value in a text field if it is not found on the page" do
     browser.should_not_receive(:text_field)
     page_object.populate_page_with('coffee' => 'value')
   end
+  it "should not populate a text field when it is disabled" do
+    page_object.should_not_receive(:tf=)
+    page_object.should_receive(:tf_element).and_return(browser)
+    browser.should_receive(:enabled?).and_return(false)
+    page_object.populate_page_with('tf' => true)
+  end
   it "should set a value in a text area" do
     page_object.should_receive(:ta=).with('value')
     page_object.stub(:is_enabled?).and_return(true)
@@ -82,10 +89,4 @@ describe PageObject::PagePopulator  do
     page_object.populate_page_with('rb' => true)
   end
-  it "should not populate a text field when it is disabled" do
-    page_object.should_not_receive(:tf=)
-    page_object.should_receive(:tf_element).and_return(browser)
-    browser.should_receive(:enabled?).and_return(false)
-    page_object.populate_page_with('tf' => true)
-  end
 end

data/spec/page-object/platforms/selenium_webdriver/selenium_page_object_spec.rb CHANGED Viewed

@@ -37,4 +37,32 @@ describe PageObject::Platforms::SeleniumWebDriver::PageObject do
       selenium_page_object.platform.div_for(:text => 'foo')
     end
   end
-end
+  context "when trying to find an element that does not exist" do
+    it "should return a surogate selenium object" do
+      selenium_browser.should_receive(:find_element).and_raise(Selenium::WebDriver::Error::NoSuchElementError)
+      page = SeleniumTestPageObject.new(selenium_browser)
+      element = page.link_element(:text => 'blah')
+      element.element.should be_instance_of PageObject::Platforms::SeleniumWebDriver::SurrogateSeleniumElement
+    end
+    it "should know it is not exist" do
+      selenium_browser.should_receive(:find_element).twice.and_raise(Selenium::WebDriver::Error::NoSuchElementError)
+      page = SeleniumTestPageObject.new(selenium_browser)
+      page.link_element(:text => 'blah').element.exists?.should be_false
+    end
+    it "should know it is not visible" do
+      selenium_browser.should_receive(:find_element).twice.and_raise(Selenium::WebDriver::Error::NoSuchElementError)
+      page = SeleniumTestPageObject.new(selenium_browser)
+      page.link_element(:text => 'blah').element.should_not be_visible
+    end
+    it "should raise an error when actions are requested" do
+      selenium_browser.should_receive(:find_element).and_raise(Selenium::WebDriver::Error::NoSuchElementError)
+      page = SeleniumTestPageObject.new(selenium_browser)
+      element = page.link_element(:text => 'blah')
+      expect { element.text }.to raise_error
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease:
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70361806936260 !ruby/object:Gem::Requirement
+  requirement: &70181129846920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *70361806936260
+  version_requirements: *70181129846920
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70361806931840 !ruby/object:Gem::Requirement
+  requirement: &70181129845600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.21.0
+        version: 2.21.2
   type: :runtime
   prerelease: false
-  version_requirements: *70361806931840
+  version_requirements: *70181129845600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70361806930760 !ruby/object:Gem::Requirement
+  requirement: &70181129844800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70361806930760
+  version_requirements: *70181129844800
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70361806907900 !ruby/object:Gem::Requirement
+  requirement: &70181129844060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70361806907900
+  version_requirements: *70181129844060
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70361798515720 !ruby/object:Gem::Requirement
+  requirement: &70181129843560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70361798515720
+  version_requirements: *70181129843560
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70361798513340 !ruby/object:Gem::Requirement
+  requirement: &70181129843100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70361798513340
+  version_requirements: *70181129843100
 description: Page Object DSL that works with both Watir and Selenium
 email:
 - jeff.morgan@leandog.com
@@ -232,11 +232,11 @@ files:
 - lib/page-object/platforms/selenium_webdriver/form.rb
 - lib/page-object/platforms/selenium_webdriver/image.rb
 - lib/page-object/platforms/selenium_webdriver/link.rb
-- lib/page-object/platforms/selenium_webdriver/null_selenium_element.rb
 - lib/page-object/platforms/selenium_webdriver/ordered_list.rb
 - lib/page-object/platforms/selenium_webdriver/page_object.rb
 - lib/page-object/platforms/selenium_webdriver/radio_button.rb
 - lib/page-object/platforms/selenium_webdriver/select_list.rb
+- lib/page-object/platforms/selenium_webdriver/surrogate_selenium_element.rb
 - lib/page-object/platforms/selenium_webdriver/table.rb
 - lib/page-object/platforms/selenium_webdriver/table_row.rb
 - lib/page-object/platforms/selenium_webdriver/text_area.rb

data/lib/page-object/platforms/selenium_webdriver/null_selenium_element.rb DELETED Viewed

@@ -1,28 +0,0 @@
-module PageObject
-  module Platforms
-    module SeleniumWebDriver
-      class NullSeleniumElement
-        def exists?
-          false
-        end
-        def visible?
-          false
-        end
-        def nil?
-          true
-        end
-        def displayed?
-          false
-        end
-        def method_missing(meth, *args)
-          $stderr.puts "You are calling #{meth} on an element that does not yet exist."
-          raise Selenium::WebDriver::Error::NoSuchElementError
-        end
-      end
-    end
-  end
-end