page-object 2.1.1 → 2.2

data/lib/page-object/page_populator.rb

@@ -34,6 +34,7 @@ module PageObject
         populate_checkbox(key, value) if is_checkbox?(key) and is_enabled?(key)
         populate_radiobuttongroup(key, value) if is_radiobuttongroup?(key)
         populate_radiobutton(key, value) if is_radiobutton?(key) and is_enabled?(key)
+        populate_select_list(key, value) if is_select_list?(key)
         populate_text(key, value) if is_text?(key) and is_enabled?(key)
       end
     end
@@ -57,7 +58,17 @@ module PageObject
       return self.send("select_#{key}", value)
     end
 
+  def populate_select_list(key, value)
+      select_element = self.send("#{key}_element")
+      if select_element.options.include?(value)
+        select_element.select(value)
+      else
+        select_element.select_value(value)
+      end
+    end
+
     def is_text?(key)
+      return false if is_select_list?(key)
       respond_to?("#{key}=".to_sym)
     end
 
@@ -73,6 +84,10 @@ module PageObject
       respond_to?("select_#{key}".to_sym) and respond_to?("#{key}_values")
     end
 
+    def is_select_list?(key)
+      respond_to?("#{key}_options".to_sym)
+    end
+
     def is_enabled?(key)
       return false if is_radiobuttongroup?(key)
       return true if (self.send "#{key}_element").tag_name == "textarea"

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

@@ -1,10 +1,10 @@
 module PageObject
   module Platforms
-    module WatirWebDriver
+    module Watir
 
       def self.create_page_object(browser)
         browser = selenium_browser(browser) unless watir?(browser)
-        return WatirWebDriver::PageObject.new(browser)
+        return Watir::PageObject.new(browser)
       end
 
       def self.is_for?(browser)
@@ -19,7 +19,7 @@ module PageObject
       end
 
       def self.root_element_for root
-        Elements::Element.new root, :platform => :watir if is_for? root
+        Elements::Element.new(root) if is_for?(root)
       end
 
       def self.browser_root_for browser
@@ -48,5 +48,3 @@ module PageObject
     end
   end
 end
-
-PageObject::Platforms.register(:watir, PageObject::Platforms::WatirWebDriver)

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

@@ -4,7 +4,7 @@ require 'page-object/core_ext/string'
 
 module PageObject
   module Platforms
-    module WatirWebDriver
+    module Watir
 
       #
       # Watir implementation of the page object platform driver.  You should not use the
@@ -14,8 +14,6 @@ module PageObject
       class PageObject
         attr_reader :browser
 
-        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)
@@ -139,8 +137,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)
-          cls.new(element, :platform => self.class::PLATFORM_NAME)
+          cls.new(element)
         end
 
         #
@@ -295,8 +292,10 @@ module PageObject
         # See PageObject::Accessors#select_list
         #
         def select_list_value_for(identifier)
-          process_watir_call("select_list(identifier).options.find {|o| o.selected?}.text",
+          options = find_watir_elements("select_list(identifier).selected_options",
                              Elements::SelectList, identifier)
+          return nil if options.empty?
+          options.first.text
         end
 
         #
@@ -1039,14 +1038,14 @@ module PageObject
           identifier, frame_identifiers = parse_identifiers(identifier, type, tag_name)
           elements = @browser.instance_eval "#{nested_frames(frame_identifiers)}#{the_call}"
           switch_to_default_content(frame_identifiers)
-          elements.map { |element| type.new(element, :platform => self.class::PLATFORM_NAME) }
+          elements.map { |element| type.new(element) }
         end
 
         def find_watir_element(the_call, type, identifier, tag_name=nil)
           identifier, frame_identifiers = parse_identifiers(identifier, type, tag_name)
           element = @browser.instance_eval "#{nested_frames(frame_identifiers)}#{the_call}"
           switch_to_default_content(frame_identifiers)
-          type.new(element, :platform => self.class::PLATFORM_NAME)
+          type.new(element)
         end
 
         def find_watir_pages(identifier, page_class)
@@ -1071,18 +1070,11 @@ module PageObject
         end
 
         def parse_identifiers(identifier, element, tag_name=nil)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, tag_name if tag_name
-          identifier = element.watir_identifier_for identifier
-          return identifier, frame_identifiers
-        end
-
-        def add_tagname_if_needed identifier, tag
-          return identifier if identifier.length < 2 and not identifier[:name]
-          identifier[:tag_name] = tag if identifier[:name]
-          identifier
+          new_identifiers = identifier.dup
+          frame_identifiers = new_identifiers.delete(:frame)
+          return new_identifiers, frame_identifiers
         end
-
+        
         def nested_frames(frame_identifiers)
           return if frame_identifiers.nil?
           frame_str = ''
@@ -1103,7 +1095,7 @@ module PageObject
         end
 
         def switch_to_default_content(frame_identifiers)
-          @browser.wd.switch_to.default_content unless frame_identifiers.nil?
+          @browser.browser.wd.switch_to.default_content unless frame_identifiers.nil?
         end
 
         def switch_to_frame(frame_identifiers)

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "2.1.1"
+  VERSION = "2.2"
 end

data/lib/page-object/widgets.rb

@@ -20,24 +20,12 @@ module PageObject
         define_nested_elements(Elements::Element, widget_tag)
         define_locators(PageObject, widget_tag)
 
-        PageObject::Platforms.constants.each { |platform|
-          platform_class = constantize_classname("PageObject::Platforms::#{platform}::PageObject")
-          if platform_class.respond_to?(:define_widget_accessors)
-            platform_class.send(:define_widget_accessors,widget_tag, widget_class, base_element_tag)
-          else
-            $stderr.puts "*** WARNING"
-            $stderr.puts "*** Platform PageObject::Platforms::#{platform} does not support widgets! Please add the 'define_widget_accessors' method in PageObject::Platforms::#{platform}::PageObject to support widgets."
-          end
-        }
+        PageObject::Platforms::Watir::PageObject.define_widget_accessors(widget_tag, widget_class, base_element_tag)
       end
     end
 
     private
 
-    def self.constantize_classname name
-      name.split("::").inject(Object) { |k,n| k.const_get(n) }
-    end
-
     def self.define_accessors(base, widget_tag, widget_class)
       accessors_module = Module.new do
         define_method widget_tag do |name, *identifier_args, &block|

data/page-object.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.name = "page-object"
   s.version = PageObject::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Jeff Morgan", 'Dane Andersen']
-  s.email = ["jeff.morgan@leandog.com", 'dane.andersen@gmail.com']
+  s.authors = ["Jeff Morgan", 'Alexis Andersen']
+  s.email = ["jeff.morgan@leandog.com", 'alexis.t.andersen@gmail.com']
   s.license       = 'MIT'
   s.homepage = "http://github.com/cheezy/page-object"
   s.summary = %q{Page Object DSL for browser testing}
@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
 
   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', '~> 3.0'
+  s.add_dependency 'page_navigation', '>= 0.10'
 
-  s.add_development_dependency 'rspec', '>= 3.0.0'
-  s.add_development_dependency 'cucumber', '>= 2.0.0'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'cucumber', '~> 2.0'
   s.add_development_dependency 'yard', '>= 0.7.2'
   s.add_development_dependency 'rack', '~> 1.0'
   s.add_development_dependency 'coveralls', '~> 0.8.1'
+  s.add_development_dependency 'net-http-persistent'
 
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: '2.2'
 platform: ruby
 authors:
 - Jeff Morgan
-- Dane Andersen
+- Alexis Andersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir
@@ -45,56 +45,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -137,10 +123,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Page Object DSL that works with both Watir and Selenium
 email:
 - jeff.morgan@leandog.com
-- dane.andersen@gmail.com
+- alexis.t.andersen@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -200,12 +200,10 @@ files:
 - lib/page-object/javascript/prototype.rb
 - lib/page-object/javascript/yui.rb
 - lib/page-object/javascript_framework_facade.rb
-- lib/page-object/loads_platform.rb
 - lib/page-object/locator_generator.rb
 - lib/page-object/nested_elements.rb
 - lib/page-object/page_factory.rb
 - lib/page-object/page_populator.rb
-- lib/page-object/platforms.rb
 - lib/page-object/platforms/watir.rb
 - lib/page-object/platforms/watir/page_object.rb
 - lib/page-object/section_collection.rb
@@ -233,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Page Object DSL for browser testing

data/lib/page-object/loads_platform.rb

@@ -1,45 +0,0 @@
-module PageObject
-  #
-  # module which provides a function for determining
-  # which platform to provide to the page object
-  # 
-  module LoadsPlatform
-    #
-    # Determines which platform the Page Object should use based upon browser
-    #
-    # @example
-    #  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
-    # @returns [PageObject] 
-    #
-    def load_platform(browser, adapters)
-      adapter_for(browser,adapters).create_page_object(browser)
-    end
-
-    def browser_for root,adapters
-      adapter_for(root,adapters).browser_for(root)
-    end
-
-    def adapter_for element_or_browser, adapters
-      adapter = adapters.values.find { |adapter|
-        adapter.is_for?(element_or_browser)
-      }
-      unless adapter
-        message = "Unable to pick a platform for the provided browser or element: #{element_or_browser.inspect}."
-        message += "\nnil was passed to the PageObject constructor instead of a valid browser or element object." if element_or_browser.nil?
-        raise message
-      end
-      adapter
-    end
-
-    def root_element_for root, adapters
-      adapter_for(root,adapters).root_element_for(root)
-    end
-
-    def browser_root_for browser, adapters
-      adapter_for(browser,adapters).browser_root_for(browser)
-    end
-  end
-end

data/lib/page-object/platforms.rb

@@ -1,17 +0,0 @@
-require 'page-object/loads_platform'
-
-module PageObject
-  module Platforms
-    @@adapters = {}
-
-    def self.get
-      @@adapters
-    end
-
-    def self.register(key, adapter)
-      @@adapters[key] = adapter
-    end
-  end
-end
-require 'page-object/platforms/watir'
-