page-object 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d2034dbff53c42fded74c511a9a8aa23bd61a9
-  data.tar.gz: cc1b2933090ed29a3e985be60cf10a3d5d1c5ea6
+  metadata.gz: bd4df22c84861242c7966223ea92954fadee7da8
+  data.tar.gz: 02756b9b394d920567793cf474ed2c175428c79b
 SHA512:
-  metadata.gz: 10dd2880b3f32b28f2f3a1e2d6901920c4fd2cc73baee209b2c8535ffd3395c6a0be298e1a46c600c01a5050dc47b8fb188158e740731be319453347ee4c4d62
-  data.tar.gz: c5dc09715ec9f42c0e5f95e58c6f2385d6d18ad90c223227cf18e151e205c73c0fbba81250d98be5678bf64243862e809820984b7da41ddd1fed80428d08226e
+  metadata.gz: 8d067360ea72b18ba508339efb5504d631b31fb55ef8a67d0cdb582b627fb57196d5818cd76fae440094d00ecd0ca1f19e1a426581ecdd887d7965d9ed6f89b4
+  data.tar.gz: 87c90ae9d1602f49c4cc203a5b1f2e4b1699412383f244deee88cdf1a94f4a07077f668459ee4ac2c34448e8ef72d9671aa06d96ddfc1baf68aecaa6136bc3fd

data/.travis.yml

@@ -21,5 +21,5 @@ before_script:
 script: bundle exec rake $RAKE_TASK
 env:
   - RAKE_TASK=spec
-  - RAKE_TASK=features:watir_webdriver WATIR_BRANCH=master
-  - RAKE_TASK=features:selenium_webdriver
+  - RAKE_TASK=features:watir WATIR_BRANCH=master
+  - RAKE_TASK=features:selenium

data/ChangeLog

@@ -1,3 +1,13 @@
+Version 2.0.0 / 2016-11-22
+* Enhancements
+  * Added focused? method on element. (Thanks Joe Schulte)
+  * Updated to use Watir 6 instead of Watir-Webdriver (Thanks Robert MacCracken)
+        This change requires updates to your project.  You will need to update your
+        Gemfile to use 'watir' instead of 'watir-webdriver' and you will need to
+        update any require statement you might have.  Also, Watir 6 is more strick
+        with text_field and text_area.  You will have to use the proper one or it
+        will not locate the element.
+
 Version 1.2.2 / 2016-11-17
 * Fixes
   * Fixed a bug that was introduced in the latest release

data/Rakefile

@@ -15,16 +15,16 @@ end
 task :spec
 
 namespace :features do
-  Cucumber::Rake::Task.new(:watir_webdriver, "Run features with Watir") do |t|
-    t.profile = "watir_webdriver"
+  Cucumber::Rake::Task.new(:watir, "Run features with Watir") do |t|
+    t.profile = "watir"
   end
 
-  Cucumber::Rake::Task.new(:selenium_webdriver, "Run features with Selenium") do |t|
+  Cucumber::Rake::Task.new(:selenium, "Run features with Selenium") do |t|
     t.profile = "selenium_webdriver"
   end
 
   desc 'Run all features'
-  task :all => [:watir_webdriver, :selenium_webdriver]
+  task :all => [:watir, :selenium]
 end
 
 desc 'Run all specs and cukes'

data/cucumber.yml

@@ -3,7 +3,7 @@ std_opts = "--no-source --color --format pretty" # Cucumber::Formatter::Fuubar"
 %>
 
 default: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only
-watir_webdriver: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only
+watir: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only
 selenium_webdriver: DRIVER=SELENIUM <%= std_opts %> --tags ~@watir_only
 focus: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only --tags @focus
 #focus:  DRIVER=SELENIUM <%= std_opts %> --tags ~@watir_only --tags @focus

data/lib/page-object.rb

@@ -10,9 +10,9 @@ require 'page-object/indexed_properties'
 require 'page-object/section_collection'
 require 'page-object/widgets'
 
-require 'watir-webdriver'
-require 'page-object/platforms/watir_webdriver/element'
-require 'page-object/platforms/watir_webdriver/page_object'
+require 'watir'
+require 'page-object/platforms/watir/element'
+require 'page-object/platforms/watir/page_object'
 require 'page-object/platforms/selenium_webdriver/element'
 require 'page-object/platforms/selenium_webdriver/page_object'
 

data/lib/page-object/loads_platform.rb

@@ -8,7 +8,7 @@ module PageObject
     # Determines which platform the Page Object should use based upon browser
     #
     # @example
-    #  platform =  load_platform(watir_webdriver_browser, PageObject.Adapters.list).send(:new, watir_webdriver_browser)
+    #  platform =  load_platform(watir_browser, PageObject.Adapters.list).send(:new, watir_browser)
     # 
     # @param [Object] A browser driver that has a supported adapter
     # @param [adapters] a list of adapters that are currently supported

data/lib/page-object/platforms.rb

@@ -13,6 +13,6 @@ module PageObject
     end
   end
 end
-require 'page-object/platforms/watir_webdriver'
+require 'page-object/platforms/watir'
 require 'page-object/platforms/selenium_webdriver'
 

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

@@ -1,4 +1,4 @@
-require 'watir-webdriver/atoms'
+require 'watir/atoms'
 
 module PageObject
   module Platforms
@@ -156,6 +156,13 @@ module PageObject
           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
         #
@@ -320,7 +327,7 @@ module PageObject
         private
 
         def bridge
-          bridge = element.instance_variable_get(:@bridge)
+          element.instance_variable_get(:@bridge)
         end
       end
     end

data/lib/page-object/platforms/{watir_webdriver.rb → watir.rb}

@@ -7,7 +7,7 @@ module PageObject
       end
 
       def self.is_for?(browser)
-        require 'watir-webdriver'
+        require 'watir'
         browser.is_a?(::Watir::Browser) || browser.is_a?(::Watir::HTMLElement)
       end
 
@@ -17,7 +17,7 @@ module PageObject
       end
 
       def self.root_element_for root
-        Elements::Element.new root, :platform => :watir_webdriver if root.is_a? ::Watir::HTMLElement
+        Elements::Element.new root, :platform => :watir if root.is_a? ::Watir::HTMLElement
       end
 
       def self.browser_root_for browser
@@ -27,4 +27,4 @@ module PageObject
   end
 end
 
-PageObject::Platforms.register(:watir_webdriver, PageObject::Platforms::WatirWebDriver)
+PageObject::Platforms.register(:watir, PageObject::Platforms::WatirWebDriver)

data/lib/page-object/platforms/{watir_webdriver → watir}/element.rb

@@ -1,4 +1,4 @@
-require 'watir-webdriver/extensions/select_text'
+require 'watir/extensions/select_text'
 
 module PageObject
   module Platforms
@@ -144,6 +144,13 @@ module PageObject
           element.focus
         end
 
+        #
+        # return true if an element is focused
+        #
+        def focused?
+          element.focused?
+        end
+
         #
         # Select the provided text
         #
@@ -164,7 +171,7 @@ module PageObject
         # @param [Integer] (defaults to: 5) seconds to wait before timing out
         #
         def when_present(timeout=::PageObject.default_element_wait)
-          element.wait_until_present(timeout)
+          element.wait_until(timeout: timeout, message: "Element not present in #{timeout} seconds",  &:present?)
           self
         end
 
@@ -175,7 +182,7 @@ module PageObject
         # timing out
         #
         def when_not_present(timeout=::PageObject.default_element_wait)
-          element.wait_while_present(timeout)
+          element.wait_while(timeout: timeout, message: "Element still present in #{timeout} seconds", &:present?)
         end
 
         #
@@ -184,9 +191,7 @@ module PageObject
         # @param [Integer] (defaults to: 5) seconds to wait before timing out
         #
         def when_visible(timeout=::PageObject.default_element_wait)
-          Object::Watir::Wait.until(timeout, "Element was not visible in #{timeout} seconds") do
-            visible?
-          end
+          element.wait_until(timeout: timeout, message: "Element not visible in #{timeout} seconds", &:visible?)
           self
         end
 
@@ -196,10 +201,7 @@ module PageObject
         # @param [Integer] (defaults to: 5) seconds to wait before timing out
         #
         def when_not_visible(timeout=::PageObject.default_element_wait)
-          Object::Watir::Wait.while(timeout, "Element still visible after #{timeout} seconds") do
-            visible?
-          end
-          self
+            element.wait_while(timeout: timeout, message: "Element still visible after #{timeout} seconds", &:visible?)
         end
 
         #
@@ -210,7 +212,7 @@ module PageObject
         # @param the block to execute when the event occurs
         #
         def wait_until(timeout=::PageObject.default_element_wait, message=nil, &block)
-          Object::Watir::Wait.until(timeout, message, &block)
+          Object::Watir::Wait.until(timeout: timeout, message: message, &block)
         end
         
         #

data/lib/page-object/platforms/{watir_webdriver → watir}/ordered_list.rb

@@ -25,7 +25,7 @@ module PageObject
         #
         def list_items
           children.collect do |obj|
-            Object::PageObject::Elements::ListItem.new(obj, :platform => :watir_webdriver)
+            Object::PageObject::Elements::ListItem.new(obj, :platform => :watir)
           end
         end
 

data/lib/page-object/platforms/{watir_webdriver → watir}/page_object.rb

@@ -14,7 +14,7 @@ module PageObject
       class PageObject
         attr_reader :browser
 
-        PLATFORM_NAME = :watir_webdriver
+        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)
@@ -69,7 +69,7 @@ module PageObject
         # platform method to wait for a block to return true
         # See PageObject#wait_until
         def wait_until(timeout, message = nil, &block)
-          @browser.wait_until(timeout, message, &block)
+          @browser.wait_until(timeout: timeout, message: message, &block)
         end
 
         #
@@ -139,7 +139,7 @@ module PageObject
           element = browser.execute_script("return document.activeElement")
           type = element.type.to_sym if element.tag_name.to_sym == :input
           cls = ::PageObject::Elements.element_class_for(element.tag_name, type)
-          # cls.new(element, :platform => :watir_webdriver)
+          # cls.new(element, :platform => :watir)
           cls.new(element, :platform => self.class::PLATFORM_NAME)
         end
 

data/lib/page-object/platforms/{watir_webdriver → watir}/unordered_list.rb

@@ -26,7 +26,7 @@ module PageObject
         #
         def list_items
           children.collect do |obj|
-            Object::PageObject::Elements::ListItem.new(obj, :platform => :watir_webdriver)
+            Object::PageObject::Elements::ListItem.new(obj, :platform => :watir)
           end
         end
 

data/lib/page-object/version.rb

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

data/lib/page-object/widgets.rb

@@ -1,6 +1,6 @@
 require 'page-object/elements'
 require 'page-object/platforms/selenium_webdriver/page_object'
-require 'page-object/platforms/watir_webdriver/page_object'
+require 'page-object/platforms/watir/page_object'
 
 module PageObject
   module Widgets

data/page-object.gemspec

@@ -2,6 +2,19 @@
 $:.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"
   s.version = PageObject::VERSION
@@ -16,8 +29,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.add_dependency 'watir-webdriver', ['>= 0.6.11', '< 0.9.9']
-  s.add_dependency 'selenium-webdriver', '>= 2.53.0'
+  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'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeff Morgan
@@ -9,42 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: watir-webdriver
+  name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.11
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.11
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.53.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.53.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: page_navigation
   requirement: !ruby/object:Gem::Requirement
@@ -230,22 +224,22 @@ files:
 - 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_webdriver.rb
-- lib/page-object/platforms/watir_webdriver/check_box.rb
-- lib/page-object/platforms/watir_webdriver/element.rb
-- lib/page-object/platforms/watir_webdriver/file_field.rb
-- lib/page-object/platforms/watir_webdriver/form.rb
-- lib/page-object/platforms/watir_webdriver/image.rb
-- lib/page-object/platforms/watir_webdriver/link.rb
-- lib/page-object/platforms/watir_webdriver/ordered_list.rb
-- lib/page-object/platforms/watir_webdriver/page_object.rb
-- lib/page-object/platforms/watir_webdriver/radio_button.rb
-- lib/page-object/platforms/watir_webdriver/select_list.rb
-- lib/page-object/platforms/watir_webdriver/table.rb
-- lib/page-object/platforms/watir_webdriver/table_row.rb
-- lib/page-object/platforms/watir_webdriver/text_area.rb
-- lib/page-object/platforms/watir_webdriver/text_field.rb
-- lib/page-object/platforms/watir_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
@@ -255,7 +249,17 @@ homepage: http://github.com/cheezy/page-object
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+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.
 rdoc_options: []
 require_paths:
 - lib