page-object 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 441fe4c75e361d33bb3938c23b47d55701f83074
-  data.tar.gz: 81d70fd600660240c761665482abed0eabde01bc
+  metadata.gz: 83096c48419028baf9d916c2f0c6baca18d821df
+  data.tar.gz: 96c9fac57d4606967a33a73780d638ad246ef3d4
 SHA512:
-  metadata.gz: 312e009090468c99cde07ab1bdf51082018952303849f902846cfdf96c9cac8364fbb601d2f1d8db164bf54d326277aa0163c130f3dcedce1bc6b87929e7cb92
-  data.tar.gz: ee8d3bcd265dfc90ecef27c3473a2010afeafb14a7c44907fcbac8165a3ec1dadaa2ba82a2e56270005ed9dfb4224c26a15c9a6de2095182a63d9a52927e050a
+  metadata.gz: dac077be6fe9e3e6a32ebc5357618ad811d6f7702787cceb0741fa9f9e279ee49c9882ee7f611b0260e852e14b1a6c4640e285f9af609ad49ae9156df3000fb3
+  data.tar.gz: 7e90d74a30d201603688e54779c2779a081b5f57154a1ceb87b623610c261eadf8a3f092ba09487c46039508c02736445792906db1ae49cf68aac719d2e89415

data/.travis.yml

@@ -1,15 +1,25 @@
-sudo: false
-language: ruby
-cache: bundler
+sudo: required
+dist: trusty
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - jruby-19mode
-
+  - 2.2.5
+  - 2.3.1
+cache: bundler
 before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+ - export CHROME_BIN=/usr/bin/google-chrome
+ - export DISPLAY=:99.0
+ - sh -e /etc/init.d/xvfb start
+ - sudo apt-get update
+ - sudo apt-get install -y libappindicator1 fonts-liberation
+ - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+ - sudo dpkg -i google-chrome*.deb
+ - CHROMEDRIVER_VERSION=$(curl -s http://chromedriver.storage.googleapis.com/LATEST_RELEASE)
+ - curl -L -O "http://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip"
+ - unzip chromedriver_linux64.zip
+ - chmod +x chromedriver
+ - sudo mv chromedriver /usr/local/bin
 
-script:
-  - "bundle exec rake test_with_coveralls"
+script: bundle exec rake $RAKE_TASK
+env:
+  - RAKE_TASK=spec
+  - RAKE_TASK=features:watir_webdriver WATIR_BRANCH=master
+  - RAKE_TASK=features:selenium_webdriver

data/ChangeLog

@@ -1,3 +1,13 @@
+Version 1.2.1 / 2016-11-11
+* Enhancements
+  * Added numerous missing element types
+  * Support for Selenium 3 (Thanks Titus Fortner)
+  * Added new generated method for Image - (name)_loaded? (Thanks joesho112358)
+  * Added CSS support for Watir (Thanks Titus Fortner)
+  * Added two new methods that check without throwing exception
+        - check_visible
+        - check_exists
+
 Version 1.2.0 / 2016-6-15
 * Enhancements
   * Added array methods to section collections (Thanks Cohen Carlisle)

data/Gemfile

@@ -2,8 +2,6 @@ source "http://rubygems.org"
 
 # adding rake so travis-ci will build properly
 gem 'rake'
-gem 'fuubar', '>= 2.0.0'
-gem 'fuubar-cucumber', '>= 0.0.22'
 gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
 gem 'growl'
 gem 'guard-rspec'
@@ -12,5 +10,9 @@ gem 'guard-cucumber'
 gem 'net-http-persistent'
 gem 'coveralls', require: false
 
+if ENV['WATIR_BRANCH']
+  gem 'watir', :git => 'https://github.com/watir/watir.git', :branch => ENV['WATIR_BRANCH']
+end
+
 
 gemspec

data/Guardfile

@@ -2,7 +2,7 @@
 # More info at https://github.com/guard/guard#readme
 
 
-guard :rspec, cmd: 'rspec --color --format Fuubar' do
+guard :rspec, cmd: 'rspec --color --format documentation' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^lib/page-object/platforms/(.+)/.+\.rb$}) do |m|

data/README.md

@@ -5,7 +5,7 @@
 [![Coverage Status](https://coveralls.io/repos/cheezy/page-object/badge.svg?nocache)](https://coveralls.io/r/cheezy/page-object)
 
 
-A simple gem that assists in creating flexible page objects for testing browser based applications. The goal is to facilitate creating abstraction layers in your tests to decouple the tests from the item they are testing and to provide a simple interface to the elements on a page. It works with both watir-webdriver and selenium-webdriver.
+A simple gem that assists in creating flexible page objects for testing browser based applications. The goal is to facilitate creating abstraction layers in your tests to decouple the tests from the item they are testing and to provide a simple interface to the elements on a page. It works with both watir and selenium-webdriver.
 
 ## Documentation
 
@@ -80,7 +80,7 @@ login_page.login_with 'cheezy', 'secret'
 ````
 
 ### Creating your page object
-page-object supports both [watir-webdriver](https://github.com/jarib/watir-webdriver) and [selenium-webdriver](http://seleniumhq.org/docs/03_webdriver.html). The one used will be determined by which driver you pass into the constructor of your page object. The page object can be created like this:
+page-object supports both [watir](https://github.com/watir/watir) and [selenium-webdriver](http://seleniumhq.org/docs/03_webdriver.html). The one used will be determined by which driver you pass into the constructor of your page object. The page object can be created like this:
 
 ````ruby
 browser = Watir::Browser.new :firefox

data/lib/page-object/accessors.rb

@@ -196,7 +196,7 @@ module PageObject
     # @param [Hash] identifier how we find a text field.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :label => Watir and Selenium
@@ -232,7 +232,7 @@ module PageObject
     # @param [Hash] identifier how we find a hidden field.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -264,7 +264,7 @@ module PageObject
     # @param [Hash] identifier how we find a text area.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -300,7 +300,7 @@ module PageObject
     # @param [Hash] identifier how we find a select list.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -376,7 +376,7 @@ module PageObject
     # @param [Hash] identifier how we find a checkbox.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -416,7 +416,7 @@ module PageObject
     # @param [Hash] identifier how we find a radio button.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -591,7 +591,7 @@ module PageObject
     # @param [Hash] identifier how we find a table.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -625,7 +625,7 @@ module PageObject
     #   * :name => Watir and Selenium
     #   * :text => Watir and Selenium
     #   * :xpath => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
     def cell(name, identifier={:index => 0}, &block)
@@ -668,19 +668,20 @@ module PageObject
     end
 
     #
-    # adds two methods - one to retrieve the image element, and another to
-    # check the image's existence.
+    # adds three methods - one to retrieve the image element, another to
+    # check the load status of the image, and another to check the
+    # image's existence.
     #
     # @example
     #   image(:logo, :id => 'logo')
-    #   # will generate 'logo_element' and 'logo?' methods
+    #   # will generate 'logo_element', 'logo_loaded?', and 'logo?' methods
     #
     # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find an image.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :alt => Watir and Selenium
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -690,6 +691,10 @@ module PageObject
     #
     def image(name, identifier={:index => 0}, &block)
       standard_methods(name, identifier, 'image_for', &block)
+      define_method("#{name}_loaded?") do
+        return platform.image_loaded_for identifier.clone unless block_given?
+        self.send("#{name}_element").loaded?
+      end
     end
     alias_method :img, :image
 
@@ -706,7 +711,7 @@ module PageObject
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :action => Watir and Selenium
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :xpath => Watir and Selenium
@@ -759,7 +764,7 @@ module PageObject
     # @param [Hash] identifier how we find an unordered list.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -788,7 +793,7 @@ module PageObject
     # @param [Hash] identifier how we find an ordered list.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -1006,7 +1011,7 @@ module PageObject
     # @param [Hash] identifier how we find a file_field.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -1215,7 +1220,7 @@ module PageObject
     # @param [Hash] identifier how we find a svg.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -1240,7 +1245,7 @@ module PageObject
     # @param [Hash] identifier how we find an element.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -1248,21 +1253,25 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def element(name, tag=:element, identifier={ :index => 0 }, &block)
-      # default tag to :element
-      #
-      # element 'button', css: 'some css'
       #
-      # is the same as
-      #
-      # element 'button', :element, css: 'some css'
+      # sets tag as element if not defined
       #
       if tag.is_a?(Hash)
         identifier = tag
         tag        = :element
       end
 
+      standard_methods(name, identifier, 'element_for', &block)
+
       define_method("#{name}") do
-        self.send("#{name}_element").text
+        element = self.send("#{name}_element")
+
+        %w(Button TextField Radio Hidden CheckBox FileField).each do |klass|
+          next unless element.element.class.to_s  == "Watir::#{klass}"
+          self.class.send(klass.gsub(/(.)([A-Z])/,'\1_\2').downcase, name, identifier, &block)
+          return self.send name
+        end
+        element.text
       end
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
@@ -1271,6 +1280,24 @@ module PageObject
       define_method("#{name}?") do
         self.send("#{name}_element").exists?
       end
+      define_method("#{name}=") do |value|
+        element = self.send("#{name}_element")
+
+        klass = case element.element
+                when Watir::TextField
+                  'text_field'
+                when Watir::TextArea
+                  'text_area'
+                when Watir::Select
+                  'select_list'
+                when Watir::FileField
+                  'file_field'
+                else
+                  raise "Can not set a #{element.element} element with #="
+                end
+        self.class.send(klass, name, identifier, &block)
+        self.send("#{name}=", value)
+      end
     end
 
     #
@@ -1286,7 +1313,7 @@ module PageObject
     # @param [Hash] identifier how we find an element.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -1294,13 +1321,8 @@ module PageObject
     # @param optional block to be invoked when element method is called
     #
     def elements(name, tag=:element, identifier={:index => 0}, &block)
-      # default tag to :element
-      #
-      # elements 'button', css: 'some css'
       #
-      # is the same as
-      #
-      # elements 'button', :element, css: 'some css'
+      # sets tag as element if not defined
       #
       if tag.is_a?(Hash)
         identifier = tag
@@ -1325,7 +1347,7 @@ module PageObject
     # @param [Hash] identifier how we find an element.  You can use multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -1349,7 +1371,7 @@ module PageObject
     # @param [Hash] identifier how we find an element.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -1376,7 +1398,7 @@ module PageObject
     # @param [Hash] identifier how we find an element.  You can use a multiple parameters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
-    #   * :css => Selenium only
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium

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

@@ -70,6 +70,23 @@ module PageObject
             downcase}s"
       end
 
+      #
+      # Keeps checking until the element is visible
+      #
+      # @param [Integer] (defaults to: 5) seconds to wait before timing out
+      #
+      def check_visible(timeout=::PageObject.default_element_wait)
+        timed_loop(timeout) do |element|
+          element.visible?
+        end
+      end
+
+      def check_exists(timeout=::PageObject.default_element_wait)
+        timed_loop(timeout) do |element|
+          element.exists?
+        end
+      end
+
       # @private
       def self.watir_identifier_for identifier
         if should_build_watir_xpath(identifier)
@@ -245,6 +262,15 @@ module PageObject
 
       private
 
+      def timed_loop(timeout)
+        end_time = ::Time.now + timeout
+        until ::Time.now > end_time
+          result = yield(self)
+          return result if result
+          sleep 0.5
+        end
+        false
+      end
 
       def constantize_classname name
         name.split("::").inject(Object) { |k,n| k.const_get(n) }

data/lib/page-object/locator_generator.rb

@@ -3,71 +3,117 @@ module PageObject
 
     BASIC_ELEMENTS = [:abbr,
                       :address,
+                      :animate,
+                      :animate_motion,
+                      :animate_transform,
                       :article,
                       :as,
                       :aside,
+                      :base,
                       :bdi,
                       :bdo,
                       :blockquote,
                       :body,
                       :br,
                       :caption,
+                      :circle,
                       :cite,
                       :code,
                       :col,
                       :colgroup,
                       :command,
+                      :cursor,
                       :data,
                       :datalist,
                       :dd,
+                      :defs,
                       :del,
+                      :desc,
                       :details,
                       :dfn,
                       :dialog,
+                      :discard,
                       :dl,
                       :dt,
+                      :ellipse,
                       :em,
                       :embed,
                       :fieldset,
                       :figcaption,
                       :figure,
+                      :font,
                       :footer,
+                      :foreign_object,
+                      :g,
                       :head,
                       :header,
                       :hgroup,
                       :hr,
+                      :html,
                       :ins,
                       :kbd,
                       :keygen,
                       :legend,
+                      :line,
+                      :linear_gradient,
+                      :main,
                       :map,
                       :mark,
+                      :marker,
                       :menu,
+                      :menuitem,
+                      :mesh_gradient,
+                      :mesh_patch,
+                      :mesh_row,
                       :meta,
+                      :metadata,
                       :meter,
+                      :mpath,
                       :nav,
                       :noscript,
                       :object,
                       :optgroup,
                       :output,
+                      :p,
                       :param,
+                      :path,
+                      :pattern,
+                      :polygon,
+                      :polyline,
                       :pre,
                       :progress,
+                      :q,
+                      :radial_gradient,
+                      :rect,
                       :rp,
                       :rt,
                       :ruby,
+                      :s,
                       :samp,
+                      :script,
                       :section,
+                      :set,
                       :small,
+                      :source,
+                      :stop,
                       :strong,
                       :style,
                       :sub,
                       :summary,
                       :sup,
+                      :switch,
+                      :symbol,
+                      :template,
+                      :text_path,
+                      :thread,
                       :time,
                       :title,
                       :track,
+                      :tspan,
+                      :u,
+                      :use,
                       :var,
+                      :view,
                       :wbr]