page-object 2.0.0 → 2.1

data/lib/page-object/indexed_properties.rb

@@ -20,6 +20,7 @@ module PageObject
               name = identifier[1]
               how_and_what = identifier[2].clone # Cannot modify the original...
               how_and_what.each do |key, value|
+                next if value.is_a? Regexp # Cannot format Regexp with %
                 if key == :index
                   how_and_what[key] = (value % index).to_i
                 else

data/lib/page-object/platforms.rb

@@ -14,5 +14,4 @@ module PageObject
   end
 end
 require 'page-object/platforms/watir'
-require 'page-object/platforms/selenium_webdriver'
 

data/lib/page-object/platforms/watir.rb

@@ -3,26 +3,48 @@ module PageObject
     module WatirWebDriver
 
       def self.create_page_object(browser)
+        browser = selenium_browser(browser) unless watir?(browser)
         return WatirWebDriver::PageObject.new(browser)
       end
 
       def self.is_for?(browser)
         require 'watir'
-        browser.is_a?(::Watir::Browser) || browser.is_a?(::Watir::HTMLElement)
+        watir?(browser) || selenium?(browser)
       end
 
       def self.browser_for root
-        return root if root.is_a?(::Watir::Browser)
-        root.browser
+        return watir_browser(root) if watir?(root)
+        return selenium_browser(root) if selenium?(root)
+        nil
       end
 
       def self.root_element_for root
-        Elements::Element.new root, :platform => :watir if root.is_a? ::Watir::HTMLElement
+        Elements::Element.new root, :platform => :watir if is_for? root
       end
 
       def self.browser_root_for browser
         browser.element
       end
+
+      private
+
+      def self.watir_browser(root)
+        return root if root.is_a?(::Watir::Browser)
+        root.browser
+      end
+
+      def self.selenium_browser(root)
+        return Watir::Browser.new(root) if root.is_a?(::Selenium::WebDriver::Driver)
+        Watir::Browser.new(Selenium::WebDriver::Driver.new(root.send(:bridge)))
+      end
+
+      def self.watir?(browser)
+        browser.is_a?(::Watir::Browser) || browser.is_a?(::Watir::HTMLElement)
+      end
+
+      def self.selenium?(browser)
+        browser.is_a?(::Selenium::WebDriver::Driver) || browser.is_a?(::Selenium::WebDriver::Element)
+      end
     end
   end
 end

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

@@ -17,8 +17,8 @@ module PageObject
         PLATFORM_NAME = :watir
 
         def self.define_widget_accessors(widget_tag, widget_class, base_element_tag)
-        define_widget_singular_accessor(base_element_tag, widget_class, widget_tag)
-        define_widget_multiple_accessor(base_element_tag, widget_class, widget_tag)
+          define_widget_singular_accessor(base_element_tag, widget_class, widget_tag)
+          define_widget_multiple_accessor(base_element_tag, widget_class, widget_tag)
         end
 
         def initialize(browser)
@@ -232,7 +232,7 @@ module PageObject
         #
         def text_fields_for(identifier)
           elements = find_watir_elements("text_fields(identifier)", Elements::TextField, identifier)
-          elements.select {|e| e.element.tag_name == 'input'}
+          elements.select { |e| e.element.tag_name == 'input' }
         end
 
         #
@@ -646,7 +646,7 @@ module PageObject
           find_watir_elements("uls(identifier)", Elements::UnorderedList, identifier, 'ul')
         end
 
-       #
+        #
         # platform method to retrieve the text from an ordered list
         # See PageObject::Accessors#ordered_list
         #

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "2.0.0"
+  VERSION = "2.1"
 end

data/lib/page-object/widgets.rb

@@ -1,5 +1,4 @@
 require 'page-object/elements'
-require 'page-object/platforms/selenium_webdriver/page_object'
 require 'page-object/platforms/watir/page_object'
 
 module PageObject

data/page-object.gemspec

@@ -2,18 +2,6 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "page-object/version"
 
-message =
-"""
-This version of the gem moves to using the new Watir gem and away from
-using Watir Webdriver. You will need to update you Gemfile to use `watir`
-instead of `watir-webdriver` and update any `require` statements in your
-code.
-
-This is an important move as Watir Webdriver will not be supported any
-longer. All new development has been moved to Watir.  There are also
-significant benefits to this move.  See the Watir site at
-https://watir.github.io for more details.
-"""
 
 Gem::Specification.new do |s|
   s.name = "page-object"
@@ -29,12 +17,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(pkg|spec|features|coverage)/}) }
   s.require_paths = ["lib"]
 
-  s.post_install_message = message
-
   s.add_dependency 'watir', '~> 6.0'
   s.add_dependency 'selenium-webdriver', '~> 3.0'
   s.add_dependency 'page_navigation', '>= 0.9'
-  s.add_dependency 'net-http-persistent', '~> 2.9.4'
+  s.add_dependency 'net-http-persistent', '~> 3.0'
 
   s.add_development_dependency 'rspec', '>= 3.0.0'
   s.add_development_dependency 'cucumber', '>= 2.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: '2.1'
 platform: ruby
 authors:
 - Jeff Morgan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.4
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.4
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -206,40 +206,8 @@ files:
 - lib/page-object/page_factory.rb
 - lib/page-object/page_populator.rb
 - lib/page-object/platforms.rb
-- lib/page-object/platforms/selenium_webdriver.rb
-- lib/page-object/platforms/selenium_webdriver/button.rb
-- lib/page-object/platforms/selenium_webdriver/check_box.rb
-- lib/page-object/platforms/selenium_webdriver/element.rb
-- lib/page-object/platforms/selenium_webdriver/file_field.rb
-- 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/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
-- lib/page-object/platforms/selenium_webdriver/text_field.rb
-- lib/page-object/platforms/selenium_webdriver/unordered_list.rb
 - lib/page-object/platforms/watir.rb
-- lib/page-object/platforms/watir/check_box.rb
-- lib/page-object/platforms/watir/element.rb
-- lib/page-object/platforms/watir/file_field.rb
-- lib/page-object/platforms/watir/form.rb
-- lib/page-object/platforms/watir/image.rb
-- lib/page-object/platforms/watir/link.rb
-- lib/page-object/platforms/watir/ordered_list.rb
 - lib/page-object/platforms/watir/page_object.rb
-- lib/page-object/platforms/watir/radio_button.rb
-- lib/page-object/platforms/watir/select_list.rb
-- lib/page-object/platforms/watir/table.rb
-- lib/page-object/platforms/watir/table_row.rb
-- lib/page-object/platforms/watir/text_area.rb
-- lib/page-object/platforms/watir/text_field.rb
-- lib/page-object/platforms/watir/unordered_list.rb
 - lib/page-object/section_collection.rb
 - lib/page-object/version.rb
 - lib/page-object/widgets.rb
@@ -249,17 +217,7 @@ homepage: http://github.com/cheezy/page-object
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2
-
-  This version of the gem moves to using the new Watir gem and away from
-  using Watir Webdriver. You will need to update you Gemfile to use `watir`
-  instead of `watir-webdriver` and update any `require` statements in your
-  code.
-
-  This is an important move as Watir Webdriver will not be supported any
-  longer. All new development has been moved to Watir.  There are also
-  significant benefits to this move.  See the Watir site at
-  https://watir.github.io for more details.
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib

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

@@ -1,30 +0,0 @@
-module PageObject
-  module Platforms
-    module SeleniumWebDriver
-
-      def self.create_page_object(browser)
-        SeleniumWebDriver::PageObject.new(browser)
-      end
-
-      def self.is_for?(browser)
-        require 'selenium-webdriver'
-        browser.is_a?(::Selenium::WebDriver::Driver) || browser.is_a?(::Selenium::WebDriver::Element)
-      end
-
-      def self.browser_for root
-        return root if root.is_a?(::Selenium::WebDriver::Driver)
-        Selenium::WebDriver::Driver.new(root.send(:bridge))
-      end
-
-      def self.root_element_for root
-        Elements::Element.new root, platform: :selenium_webdriver if root.is_a?(::Selenium::WebDriver::Element)
-      end
-
-      def self.browser_root_for browser
-        browser.find_element(tag_name: 'html')
-      end
-    end
-  end
-end
-
-PageObject::Platforms.register(:selenium_webdriver, PageObject::Platforms::SeleniumWebDriver)

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

@@ -1,15 +0,0 @@
-module PageObject
-  module Platforms
-    module SeleniumWebDriver
-      module Button
-        #
-        # Override PageObject::PLatforms::SeleniumElement#text
-        # to get #text from buttons and #attribute('value') from inputs
-        #
-        def text
-          element.tag_name == 'button' ? element.text : element.attribute('value')
-        end
-      end
-    end
-  end
-end

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

@@ -1,29 +0,0 @@
-module PageObject
-  module Platforms
-    module SeleniumWebDriver
-      module CheckBox
-
-        #
-        # check the checkbox
-        #
-        def check
-          element.click unless element.selected?
-        end
-
-        #
-        # uncheck the checkbox
-        #
-        def uncheck
-          element.click if element.selected?
-        end
-
-        #
-        # return true if it is checked
-        #
-        def checked?
-          element.selected?
-        end
-      end
-    end
-  end
-end

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

@@ -1,335 +0,0 @@
-require 'watir/atoms'
-
-module PageObject
-  module Platforms
-    #
-    # Selenium implementation of the common functionality found across all elements
-    #
-    module SeleniumWebDriver
-      module Element
-        include Watir::Atoms
-
-        #
-        # return true if an element is visible
-        #
-        def visible?
-          element.displayed?
-        end
-
-        #
-        # return true if an element exists
-        #
-        def exists?
-          not element.nil?
-        end
-
-        #
-        # flash the element by temporarily changing the background color
-        #
-        def flash
-          original_color = attribute('backgroundColor')
-          the_bridge = bridge
-          10.times do |n|
-            color = (n % 2 == 0) ? 'red' : original_color
-            the_bridge.execute_script("arguments[0].style.backgroundColor = '#{color}'", element)
-          end
-        end
-        
-        #
-        # Get the text for the element
-        #
-        # @return [String]
-        #
-        def text
-          element.text
-        end
-
-        #
-        # Get the html for the element
-        #
-        # @return [String]
-        #
-        def html
-          script = "return (%s).apply(null, arguments)" % ATOMS.fetch(:getOuterHtml)
-          bridge.execute_script(script, element).strip
-        end
-
-        #
-        # Get the value of this element
-        #
-        # @return [String]
-        #
-        def value
-          element.attribute('value')
-        end
-
-        #
-        # compare this element to another to determine if they are equal
-        #
-        def ==(other)
-          other.is_a? self.class and element == other.element
-        end
-
-        #
-        # Get the tag name of this element
-        #
-        # @return [String]
-        #
-        def tag_name
-          element.tag_name
-        end
-
-        #
-        # Get the value of a the given attribute of the element.  Will
-        # return the current value, even if this has been modified
-        # after the page has been loaded. More exactly, this method
-        # will  return the value of the given attribute, unless that
-        # attribute is not present, in which case the value of the
-        # property with the same name is returned. If neither value is
-        # set, nil is returned. The "style" attribute is converted as
-        # best can be to a text representation with a trailing
-        # semi-colon. The following are deemed to be "boolean"
-        # attributes, and will return either "true" or "false":
-        #
-        # async, autofocus, autoplay, checked, compact, complete,
-        # controls, declare, defaultchecked, defaultselected, defer,
-        # disabled, draggable, ended, formnovalidate, hidden, indeterminate,
-        # iscontenteditable, ismap, itemscope, loop, multiple, muted,
-        # nohref, noresize, noshade, novalidate, nowrap, open, paused,
-        # pubdate, readonly, required, reversed, scoped, seamless, seeking,
-        # selected, spellcheck, truespeed, willvalidate
-        #
-        # Finally, the following commonly mis-capitalized
-        # attribute/property names are evaluated as expected:
-        #
-        # class, readonly
-        #
-        # @param [String]
-        #   attribute name
-        # @return [String,nil]
-        #   attribute value
-        #
-        def attribute(attribute_name)
-          element.attribute attribute_name
-        end
-
-        #
-        # Fire the provided event on the current element
-        #
-        def fire_event(event_name)
-          event_name = event_name.to_s.sub(/^on/, '').downcase
-          script = "return (%s).apply(null, arguments)" % ATOMS.fetch(:fireEvent)
-          bridge.execute_script(script, element, event_name)
-        end
-
-        #
-        # hover over the element
-        #
-        def hover
-          mouse = Selenium::WebDriver::Mouse.new(bridge)
-          mouse.move_to(element)
-        end
-
-        #
-        # hover over the element
-        #
-        def double_click
-          mouse = Selenium::WebDriver::Mouse.new(bridge)
-          mouse.double_click(element)
-        end
-
-        #
-        # find the parent element
-        #
-        def parent
-          script = "return (%s).apply(null, arguments)" % ATOMS.fetch(:getParentElement)
-          parent = bridge.execute_script(script, element)
-          type = element.attribute(:type).to_s.downcase if parent.tag_name.to_sym == :input
-          cls = ::PageObject::Elements.element_class_for(parent.tag_name, type)
-          cls.new(parent, :platform => @platform.class::PLATFORM_NAME)
-        end
-
-        #
-        # Set the focus to the current element
-        #
-        def focus
-          bridge.execute_script("return arguments[0].focus()", element)
-        end
-
-        #
-        # return true if an element is focused
-        #
-        def focused?
-          element == bridge.active_element
-        end
-
-        #
-        # Select the provided text
-        #
-        def select_text(text)
-          Watir::Atoms.load(:selectText)
-          script = "return (%s).apply(null, arguments)" % ATOMS.fetch(:selectText)
-          bridge.execute_script(script, element, text)
-        end
-
-        #
-        # Click this element
-        #
-        def right_click
-          element.context_click
-        end
-
-        #
-        # Waits until the element is present
-        #
-        # @param [Integer] (defaults to: 5) seconds to wait before timing out
-        #
-        def when_present(timeout=::PageObject.default_element_wait)
-          wait = Object::Selenium::WebDriver::Wait.new({:timeout => timeout, :message => "Element not present in #{timeout} seconds"})
-          wait.until do
-            self.exists?
-          end
-          self
-        end
-
-        #
-        # Waits until the element is not present
-        #
-        # @param [Integer] (defaults to: 5) seconds to wait before
-        # timing out
-        #
-        def when_not_present(timeout=::PageObject.default_element_wait)
-          wait = Object::Selenium::WebDriver::Wait.new({:timeout => timeout, :message => "Element still present in #{timeout} seconds"})
-          wait.until do
-            not_present = false
-            begin
-              not_present = false if element and element.displayed?
-            rescue Selenium::WebDriver::Error::ObsoleteElementError
-              not_present = true
-            end
-            not_present
-          end
-        end
-
-        #
-        # Waits until the element is visible
-        #
-        # @param [Integer] (defaults to: 5) seconds to wait before timing out
-        #
-        def when_visible(timeout=::PageObject.default_element_wait)
-          wait = Object::Selenium::WebDriver::Wait.new({:timeout => timeout, :message => "Element not visible in #{timeout} seconds"})
-          wait.until do
-            self.visible?
-          end
-          self
-        end
-
-        #
-        # Waits until the element is not visible
-        #
-        # @param [Integer] (defaults to: 5) seconds to wait before timing out
-        #
-        def when_not_visible(timeout=::PageObject.default_element_wait)
-          wait = Object::Selenium::WebDriver::Wait.new({:timeout => timeout, :message => "Element still visible in #{timeout} seconds"})
-          wait.until do
-            not self.visible?
-          end
-          self
-        end
-
-        #
-        # Waits until the block returns true
-        #
-        # @param [Integer] (defaults to: 5) seconds to wait before timing out
-        # @param [String] the message to display if the event timeouts
-        # @param the block to execute when the event occurs
-        #
-        def wait_until(timeout=::PageObject.default_element_wait, message=nil, &block)
-          wait = Object::Selenium::WebDriver::Wait.new({:timeout => timeout, :message => message})
-          wait.until &block
-        end
-        
-        #
-        # Send keystrokes to this element
-        #
-        # @param [String, Symbol, Array]
-        #
-        # Examples:
-        #
-        #     element.send_keys "foo"                     #=> value: 'foo'
-        #     element.send_keys "tet", :arrow_left, "s"   #=> value: 'test'
-        #     element.send_keys [:control, 'a'], :space   #=> value: ' '
-        #
-        # @see Selenium::WebDriver::Keys::KEYS
-        #
-        def send_keys(*args)
-          element.send_keys(*args)
-        end
-         
-        #
-        # clear the contents of the element
-        #
-        def clear
-          element.clear
-        end
-
-        #
-        # get the id of the element
-        #
-        def id
-          attribute(:id)
-        end
-
-        #
-        # Scroll until the element is viewable
-        #
-        def scroll_into_view
-          element.location_once_scrolled_into_view
-        end
-
-        #
-        # location of element (x, y)
-        #
-        def location
-          element.location
-        end
-
-        #
-        # size of element (width, height)
-        #
-        def size
-          element.size
-        end
-
-        #
-        # Get height of element
-        #
-        def height
-          element.size['height']
-        end
-
-        #
-        # Get width of element
-        #
-        def width
-          element.size['width']
-        end
-
-        #
-        # Get centre coordinates of element
-        #
-        def centre
-          location = element.location
-          size = element.size
-          {'y' => (location['y'] + (size['height']/2)), 'x' => (location['x'] + (size['width']/2))}
-        end
-
-        private
-
-        def bridge
-          element.instance_variable_get(:@bridge)
-        end
-      end
-    end
-  end
-end