page-object 2.1.1 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7edeb443a2ae4b8e0c752a4fa82fbb542684b22
-  data.tar.gz: 200d7628d5d45d22936487972e0c7e8499ce9a33
+  metadata.gz: 0a9026e5a1dfab04ad9562d3e2c1ff46224809d3
+  data.tar.gz: b64e10f88d26956b50be3feb5a41627f40dc2378
 SHA512:
-  metadata.gz: 3b1fb48e00b12e3c24e11b8b3c50399339585e0ea3a75d750f975b315885143a425cad12a59f4b6baf7d78ec1d2dda3f50caf734772d5025d9ef550c67f7c1ef
-  data.tar.gz: bb6e4eed2a1246dfd12c3913e052607d673ee862118caa59148f9c3b22a8c058daba3cca0279d12a6c37c8a667520f9f4d761a7f34178583f7c0396eb56f1df8
+  metadata.gz: d780f2a594808da6f2bc24a6560c6a56bff7868600a6d025d91c98e68571c9bb85626c42a47a46983dd213ec9f84576f390f1dec987ee8dcc817d337131d1be7
+  data.tar.gz: 5af925dc3bcdf8d3bca259d53f4e88b75b258e7f0601004a02b8f55d533a82eebc25292c016dc5751bd488d303aef25fa96d0cd6dfc661a6c86a2833314733e5

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.1
+ruby-2.4.0

data/ChangeLog

@@ -1,3 +1,15 @@
+Version 2.2 / 2017-8-4
+* Enhancements
+  * when_visible and when_not_visible now wait for element to be present before checking
+  * populate_page_with can populate select_list using values (Thanks vveliev)
+  * Removed all custom locator mappings
+  * Removed platform loading
+* Fixes
+  * Moved net-http-persistent to a development dependency
+  * Fixed issue with frames, sections, and indexed properties
+  * Fixed issue impacting rspec be_visible/be_present DSL
+  * Fixed issue with getting content of empty multi-select
+
 Version 2.1.1 / 2017-3-7
 * Fixes
   * Fixed issue with import ordering
@@ -60,7 +72,7 @@ Version 1.2.0 / 2016-6-15
 
 === Version 1.1.0 / 2015-5-2
 * Enhancements
-  * Performance enhancements when initializing elements (Thanks Dane Andersen)
+  * Performance enhancements when initializing elements (Thanks Alexis Andersen)
   * Enabled button elements to return text when using selenium-webdriver.
   * Added support for :index identifier in indexed properties.
   * Added page_section and page_sections accessor methods which can specify a page object of elements on another page object.
@@ -75,7 +87,7 @@ Version 1.2.0 / 2016-6-15
   * Added hashes method to Table to return table contents as a Hash (Thanks Tobi)
   * Fixed wait_for_expected_title so it detects if the title changes (Thanks Levi Wilson)
 * Fixes
-  * Fixed issue that allows access to elements on other indexed properties (Thanks Dane Andersen)
+  * Fixed issue that allows access to elements on other indexed properties (Thanks Alexis Andersen)
   * Removed the method to clear radio buttons.  It didn't work on selenium and threw an exception on watir. (Thanks Justin Ko)
 
 === Version 1.0.2 / 2014-7-21

data/Gemfile

@@ -7,12 +7,7 @@ gem 'growl'
 gem 'guard-rspec'
 gem 'listen', '3.0.8' #Last version that supports ruby 2.0
 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/lib/page-object.rb

@@ -1,7 +1,6 @@
 require 'watir'
 require 'page-object/version'
 require 'page-object/accessors'
-require 'page-object/platforms'
 require 'page-object/element_locators'
 require 'page-object/nested_elements'
 require 'page-object/page_factory'
@@ -11,6 +10,7 @@ require 'page-object/indexed_properties'
 require 'page-object/section_collection'
 require 'page-object/widgets'
 
+require 'page-object/platforms/watir'
 require 'page-object/platforms/watir/page_object'
 
 #
@@ -42,7 +42,6 @@ require 'page-object/platforms/watir/page_object'
 # @see PageObject::Accessors to see what class level methods are added to this module at runtime.
 #
 module PageObject
-  include LoadsPlatform
   include ElementLocators
   include PagePopulator
 
@@ -70,14 +69,14 @@ module PageObject
   def initialize(root, visit=false)
     initialize_accessors if respond_to?(:initialize_accessors)
     initialize_browser(root)
-    goto if visit && respond_to?(:goto)
+    goto if visit && self.class.instance_methods(false).include?(:goto)
     initialize_page if respond_to?(:initialize_page)
   end
 
   def initialize_browser(root)
-    @root_element = root_element_for root, PageObject::Platforms.get
-    @browser = browser_for root, PageObject::Platforms.get
-    include_platform_driver(root)
+    @root_element = PageObject::Platforms::Watir.root_element_for root
+    @browser = root 
+    @platform = PageObject::Platforms::Watir::PageObject.new @browser
   end
 
   # @private
@@ -412,11 +411,7 @@ module PageObject
   private
 
   def root
-    @root_element || browser_root_for(browser, PageObject::Platforms.get)
-  end
-
-  def include_platform_driver(browser)
-    @platform = load_platform(browser, PageObject::Platforms.get)
+    @root_element || PageObject::Platforms::Watir.browser_root_for(browser)
   end
 
   def call_block(&block)

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

@@ -3,17 +3,6 @@ module PageObject
   module Elements
     class Button < Element
 
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
-      end
-
-      protected
-
-      def self.watir_finders
-        super + [:text, :value, :src, :alt, :css]
-      end
-
     end
 
     ::PageObject::Elements.type_to_class[:submit] = ::PageObject::Elements::Button

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

@@ -23,12 +23,6 @@ module PageObject
         element.set?
       end
 
-      protected
-
-      def self.watir_finders
-        super + [:value, :label]
-      end
-
     end
 
     ::PageObject::Elements.type_to_class[:checkbox] = ::PageObject::Elements::CheckBox

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

@@ -1,13 +1,6 @@
 module PageObject
   module Elements
     class Div < Element
-
-      protected
-
-      def self.watir_finders
-        super + [:text, :title]
-      end
-      
     end
 
     ::PageObject::Elements.tag_to_class[:div] = ::PageObject::Elements::Div

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

@@ -6,16 +6,16 @@ module PageObject
     #
     # Contains functionality that is common across all elements.
     #
-    # @see PageObject::Platforms::WatirWebDriver::Element for the Watir version of all common methods
+    # @see PageObject::Platforms::Watir::Element for the Watir version of all common methods
     #
     class Element
       include ::PageObject::NestedElements
 
       attr_reader :element
 
-      def initialize(element, platform)
+      def initialize(element)
         @element = element
-        include_platform_for platform
+        @platform = PageObject::Platforms::Watir::PageObject.new(@element)
       end
 
       #
@@ -42,8 +42,8 @@ module PageObject
       #
       def self.plural_form
         "#{self.to_s.split('::')[-1].
-            gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-            gsub(/([a-z\d])([A-Z])/,'\1_\2').
+            gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+            gsub(/([a-z\d])([A-Z])/, '\1_\2').
             tr("-", "_").
             downcase}s"
       end
@@ -125,7 +125,7 @@ module PageObject
         parent = element.parent
         type = element.type if parent.tag_name.to_sym == :input
         cls = ::PageObject::Elements.element_class_for(parent.tag_name, type)
-        cls.new(parent, :platform => :watir)
+        cls.new(parent)
       end
 
       #
@@ -134,7 +134,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(timeout: timeout, message: "Element not present in #{timeout} seconds",  &:present?)
+        element.wait_until(timeout: timeout, message: "Element not present in #{timeout} seconds", &:present?)
         self
       end
 
@@ -154,6 +154,7 @@ module PageObject
       # @param [Integer] (defaults to: 5) seconds to wait before timing out
       #
       def when_visible(timeout=::PageObject.default_element_wait)
+        when_present(timeout)
         element.wait_until(timeout: timeout, message: "Element not visible in #{timeout} seconds", &:visible?)
         self
       end
@@ -164,7 +165,8 @@ module PageObject
       # @param [Integer] (defaults to: 5) seconds to wait before timing out
       #
       def when_not_visible(timeout=::PageObject.default_element_wait)
-          element.wait_while(timeout: timeout, message: "Element still visible after #{timeout} seconds", &:visible?)
+        when_present(timeout)
+        element.wait_while(timeout: timeout, message: "Element still visible after #{timeout} seconds", &:visible?)
       end
 
       #
@@ -222,22 +224,6 @@ module PageObject
         {'y' => (location['y'] + (size['height']/2)), 'x' => (location['x'] + (size['width']/2))}
       end
 
-      # @private
-      def self.watir_identifier_for identifier
-        if should_build_watir_xpath(identifier)
-          how = :xpath
-          what = build_xpath_for(identifier)
-          return how => what
-        end
-        all_identities = {}
-        identifier.each do |key, value|
-          each = {key => value}
-          ident = identifier_for each, watir_finders, watir_mapping
-          all_identities[ident.keys.first] = ident.values.first
-        end
-        all_identities
-      end
-
       # @private
       # delegate calls to driver element
       def method_missing(*args, &block)
@@ -245,99 +231,11 @@ module PageObject
         element.send m, *args, &block
       end
 
-      protected
-
-      def self.should_build_watir_xpath identifier
-        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label', 'area', 'canvas', 'audio', 'video', 'b', 'i'].include? identifier[:tag_name] and identifier[:name]
+      def respond_to_missing?(m,*args)
+        element.respond_to?(m) || super
       end
 
-      def self.build_xpath_for identifier
-        tag_locator = identifier.delete(:tag_name)
-        idx = identifier.delete(:index)
-        if tag_locator == 'input' and identifier[:type] == 'submit'
-          identifier.delete(:type)
-          btn_ident = identifier.clone
-          if btn_ident[:value]
-            btn_ident[:text] = btn_ident[:value]
-            btn_ident.delete(:value)
-          end
-          xpath = ".//button"
-          xpath << "[#{attribute_expression(btn_ident)}]" unless btn_ident.empty?
-          xpath = "(#{xpath})[#{idx+1}]" if idx
-          identifier[:type] = %w[button reset submit image]
-          xpath << " | .//input"
-        else
-          xpath = ".//#{tag_locator}"
-        end
-        xpath << "[#{attribute_expression(identifier)}]" unless identifier.empty?
-        xpath = "(#{xpath})[#{idx+1}]" if idx
-        xpath
-      end
-
-      def self.attribute_expression(identifier)
-        identifier.map do |key, value|
-          if value.kind_of?(Array)
-            "(" + value.map { |v| equal_pair(key, v) }.join(" or ") + ")"
-          else
-            equal_pair(key, value)
-          end
-        end.join(" and ")
-      end
-
-      def self.equal_pair(key, value)
-        if key == :label
-          "@id=//label[normalize-space()=#{xpath_string(value)}]/@for"
-        else
-          "#{lhs_for(key)}=#{xpath_string(value)}"
-        end
-      end
-
-      def self.lhs_for(key)
-        case key
-          when :text, 'text'
-            'normalize-space()'
-          when :href
-            'normalize-space(@href)'
-          else
-            "@#{key.to_s.gsub("_", "-")}"
-        end
-      end
-
-      def self.xpath_string(value)
-        if value.include? "'"
-          parts = value.split("'", -1).map { |part| "'#{part}'" }
-          string = parts.join(%{,"'",})
-          "concat(#{string})"
-        else
-          "'#{value}'"
-        end
-      end
-
-      def self.identifier_for identifier, find_by, find_by_mapping
-        how, what = identifier.keys.first, identifier.values.first
-        return how => what if find_by.include? how or how == :tag_name
-        return find_by_mapping[how] => what if find_by_mapping[how]
-        identifier
-      end
-
-      def self.watir_finders
-        [:class, :id, :index, :name, :xpath]
-      end
-
-      def self.watir_mapping
-        {}
-      end
-
-      def include_platform_for platform
-        platform_information = PageObject::Platforms.get
-        raise ArgumentError,"Expected hash with at least a key :platform for platform information! (#{platform.inspect})" unless platform.class == Hash && platform.has_key?(:platform)
-        platform_name = platform[:platform]
-
-        raise ArgumentError, "Unknown platform #{platform_name}! Expect platform to be one of the following: #{platform_information.keys.inspect}" unless platform_information.keys.include?(platform_name)
-        base_platform_class = "#{platform_information[platform_name]}::"
-
-        @platform = constantize_classname(base_platform_class+ "PageObject").new(@element)
-      end
+      protected
 
       def to_ary
         nil
@@ -355,10 +253,6 @@ module PageObject
         false
       end
 
-      def constantize_classname name
-        name.split("::").inject(Object) { |k,n| k.const_get(n) }
-      end
-
     end
   end
 end

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

@@ -10,12 +10,6 @@ module PageObject
         element.set(new_value)
       end
 
-      protected
-
-      def self.watir_finders
-        super + [:title, :label]
-      end
-
     end
 
     ::PageObject::Elements.type_to_class[:file] = ::PageObject::Elements::FileField

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

@@ -3,12 +3,6 @@ module PageObject
   module Elements
     class Form < Element
 
-      protected
-
-      def self.watir_finders
-        super + [:action]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:form] = ::PageObject::Elements::Form

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

@@ -6,12 +6,6 @@ module PageObject
         raise "click is not available on the hidden field element"
       end
 
-      protected
-
-      def self.watir_finders
-        super + [:text, :value]
-      end
-
     end
 
     ::PageObject::Elements.type_to_class[:hidden] = ::PageObject::Elements::HiddenField

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

@@ -16,12 +16,6 @@ module PageObject
         element.height
       end
 
-      protected
-
-      def self.watir_finders
-        super + [:alt, :src]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:img] = ::PageObject::Elements::Image

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

@@ -2,12 +2,6 @@ module PageObject
   module Elements
     class Label < Element
 
-      protected
-
-      def self.watir_finders
-        super + [:text]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:label] = ::PageObject::Elements::Label

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

@@ -3,16 +3,6 @@ module PageObject
   module Elements
     class Link < Element
 
-      protected
-
-      def self.watir_finders
-        super + [:href, :text, :css, :title]
-      end
-
-      def self.watir_mapping
-        super.merge({:link => :text, :link_text => :text})
-      end
-
     end
     
     ::PageObject::Elements.tag_to_class[:a] = ::PageObject::Elements::Link