ae_page_objects 1.5.0 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdbc7b1c3cc7929e18cae25d6b5a0073bc941d85
-  data.tar.gz: 0767bbea656f6a123d00c2dae7c00673714272d3
+  metadata.gz: 2dec9e34721561ba781508ef0b2c14b254fa4f5f
+  data.tar.gz: 33356ca72c8529bbb1c64169c42c290c545b486b
 SHA512:
-  metadata.gz: 12c29ba3329811692f161d16a46dc95bf187492c49585295e183f2d63bc356420a3ea76a4cb158b77f49db322517f18b674020741424389427f975c7189d3fb9
-  data.tar.gz: fa23580da483d787a283c96ac7495780ff52b17dd7563892aa4e89bed21205e15a97b64de1a547aafeb373f3391496fce569bf1f933d443b241e9e15eeca5d63
+  metadata.gz: 3ff183bf91b4049702f1fbb32192e7f92d05e279743c1091e0a5740ea50dc89ccf595a7fdefa3ae7c3cdf14a77fef9c3f214d9ad5a8f1bcf58d5ae4b6b9e12ea
+  data.tar.gz: 4b7c1c3de1d8f16b7f38b2cfaf4f67e5b5f0b1671b614d0be8a5e147bcf568104c82e00362d06428e2bebce6bdd29c939acb486441a8efd343eea461056b2ecf

data/lib/ae_page_objects.rb

@@ -9,14 +9,12 @@ module AePageObjects
   autoload :Site,                 'ae_page_objects/core/site'
   autoload :BasicRouter,          'ae_page_objects/core/basic_router'
   autoload :ApplicationRouter,    'ae_page_objects/core/application_router'
-  autoload :RakeRouter,           'ae_page_objects/core/rake_router'
   autoload :Dsl,                  'ae_page_objects/core/dsl'
 
   autoload :Singleton,            'ae_page_objects/util/singleton'
   autoload :InternalHelpers,      'ae_page_objects/util/internal_helpers'
   autoload :HashSymbolizer,       'ae_page_objects/util/hash_symbolizer'
   autoload :Inflector,            'ae_page_objects/util/inflector'
-  autoload :Waiter,               'ae_page_objects/util/waiter'
 
   module MultipleWindows
     autoload :Browser,                   'ae_page_objects/multiple_windows/browser'
@@ -32,8 +30,6 @@ module AePageObjects
     autoload :SameWindowLoaderStrategy,  'ae_page_objects/single_window/same_window_loader_strategy'
   end
 
-  autoload :Window,            'ae_page_objects/window'
-
   autoload :DocumentQuery,     'ae_page_objects/document_query'
   autoload :DocumentLoader,    'ae_page_objects/document_loader'
 
@@ -48,35 +44,48 @@ module AePageObjects
   autoload :Select,            'ae_page_objects/elements/select'
   autoload :Checkbox,          'ae_page_objects/elements/checkbox'
 
-  def self.browser
-    @browser ||= begin
-      driver = Capybara.current_session.driver
+  class << self
 
-      case driver
-      when Capybara::Selenium::Driver then
-        MultipleWindows::Browser.new
-      else
-        SingleWindow::Browser.new
+    def browser
+      @browser ||= begin
+        driver = Capybara.current_session.driver
+
+        case driver
+        when Capybara::Selenium::Driver then
+          MultipleWindows::Browser.new
+        else
+          SingleWindow::Browser.new
+        end
       end
     end
-  end
 
-  def self.wait_until(seconds_to_wait = nil, error_message = nil)
-    seconds_to_wait ||= Capybara.default_wait_time
-    start_time      = Time.now
+    def wait_until(seconds_to_wait = nil, error_message = nil)
+      seconds_to_wait ||= default_max_wait_time
+      start_time      = Time.now
+
+      until result = yield
+        delay = seconds_to_wait - (Time.now - start_time)
 
-    until result = yield
-      delay = seconds_to_wait - (Time.now - start_time)
+        if delay <= 0
+          raise WaitTimeoutError, error_message || "Timed out waiting for condition"
+        end
 
-      if delay <= 0
-        raise WaitTimeoutError, error_message || "Timed out waiting for condition"
+        sleep(0.05)
+        raise FrozenInTime, "Time appears to be frozen" if Time.now == start_time
       end
 
-      sleep(0.05)
-      raise FrozenInTime, "Time appears to be frozen" if Time.now == start_time
+      result
     end
 
-    result
+    private
+
+    def default_max_wait_time
+      if Capybara.respond_to?(:default_max_wait_time)
+        Capybara.default_max_wait_time
+      else
+        Capybara.default_wait_time
+      end
+    end
   end
 end
 

data/lib/ae_page_objects/core/application_router.rb

@@ -58,29 +58,6 @@ module AePageObjects
         ResolvedRoute = Struct.new(:controller, :action)
       end
 
-      class Rails23 < Base
-
-      private
-
-        def routes
-          @routes ||= begin
-            routes_class = Class.new do
-              include ActionController::UrlWriter
-            end
-            ActionController::Routing::Routes.install_helpers(routes_class)
-            routes_class.new
-          end
-        end
-
-        def normalize_url(url)
-          url
-        end
-
-        def router
-          ActionController::Routing::Routes
-        end
-      end
-
       class Rails3 < Base
 
       private
@@ -155,9 +132,7 @@ module AePageObjects
 
     def recognizer
       @recognizer ||= begin
-        if ::Rails.version =~ /\A2\.3/
-          Recognizer::Rails23.new
-        elsif ::Rails.version =~ /\A3\.[01]/
+        if ::Rails.version =~ /\A3\.[01]/
           Recognizer::Rails3.new
         elsif ::Rails.version =~ /\A3\.2/
           Recognizer::Rails32.new

data/lib/ae_page_objects/element_proxy.rb

@@ -33,11 +33,6 @@ module AePageObjects
       false
     end
 
-    def not_visible?
-      warn "[DEPRECATION WARNING]: AePageObjects::Element#not_visible? is deprecated and will be removed in version 2.0.0. Use AePageObjects::Element#hidden? instead."
-      hidden?
-    end
-
     def present?
       wait_until_present
       true
@@ -52,11 +47,6 @@ module AePageObjects
       false
     end
 
-    def not_present?
-      warn "[DEPRECATION WARNING]: AePageObjects::Element#not_present? is deprecated and will be removed in version 2.0.0. Use AePageObjects::Element#absent? instead."
-      absent?
-    end
-
     def presence
       implicit_element
     rescue LoadingElementFailed
@@ -90,11 +80,6 @@ module AePageObjects
       raise ElementNotPresent, "element_class: #{@element_class}, options: #{@options.inspect}"
     end
 
-    def wait_for_presence(timeout = nil)
-      warn "[DEPRECATION WARNING]: AePageObjects::Element#wait_for_presence is deprecated and will be removed in version 2.0.0. Use AePageObjects::Element#wait_until_present instead."
-      wait_until_present(timeout)
-    end
-
     def wait_until_absent(timeout = nil)
       with_reloaded_element(timeout) do
         @loaded_element.nil?
@@ -104,11 +89,6 @@ module AePageObjects
       raise ElementNotAbsent, "element_class: #{@element_class}, options: #{@options.inspect}"
     end
 
-    def wait_for_absence(timeout = nil)
-      warn "[DEPRECATION WARNING]: AePageObjects::Element#wait_for_absence is deprecated and will be removed in version 2.0.0. Use AePageObjects::Element#wait_until_absent instead."
-      wait_until_absent(timeout)
-    end
-
     def is_a?(type)
       type == @element_class || type == ElementProxy
     end

data/lib/ae_page_objects/elements/collection.rb

@@ -65,23 +65,19 @@ module AePageObjects
     def item_xpath
       @item_xpath ||= begin
         evaled_locator = eval_locator(@item_locator)
+        
+        query_args = evaled_locator + [{:exact => true}]
+        query = Capybara::Query.new(*query_args)
 
-        if Capybara::VERSION =~ /\A1/
-          Capybara::Selector.normalize(*evaled_locator).xpaths.first
-        else
-          query_args = evaled_locator + [{:exact => true}]
-          query = Capybara::Query.new(*query_args)
+        result = query.xpath
 
-          result = query.xpath
-
-          # if it's CSS, we need to run it through XPath as Capybara::Query#xpath only
-          # works when the selector is xpath. Lame.
-          if query.selector.format == :css
-            result = XPath.css(query.xpath).to_xpath
-          end
-
-          result
+        # if it's CSS, we need to run it through XPath as Capybara::Query#xpath only
+        # works when the selector is xpath. Lame.
+        if query.selector.format == :css
+          result = XPath.css(query.xpath).to_xpath
         end
+
+        result
       end
     end
 

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '1.5.0'.freeze
+  VERSION = '2.0.0.beta1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Donnie Tognazzini
@@ -14,22 +14,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.1'
 description: Capybara Page Objects pattern
 email:
 - engineering@appfolio.com
@@ -41,7 +35,6 @@ files:
 - lib/ae_page_objects/core/application_router.rb
 - lib/ae_page_objects/core/basic_router.rb
 - lib/ae_page_objects/core/dsl.rb
-- lib/ae_page_objects/core/rake_router.rb
 - lib/ae_page_objects/core/site.rb
 - lib/ae_page_objects/core/universe.rb
 - lib/ae_page_objects/core_ext/module.rb
@@ -70,9 +63,7 @@ files:
 - lib/ae_page_objects/util/internal_helpers.rb
 - lib/ae_page_objects/util/page_polling.rb
 - lib/ae_page_objects/util/singleton.rb
-- lib/ae_page_objects/util/waiter.rb
 - lib/ae_page_objects/version.rb
-- lib/ae_page_objects/window.rb
 homepage: http://github.com/appfolio/ae_page_objects
 licenses:
 - MIT
@@ -85,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/ae_page_objects/core/rake_router.rb

@@ -1,152 +0,0 @@
-module AePageObjects
-  class RakeRouter < BasicRouter
-
-    attr_reader :routes
-
-    def initialize(rake_routes, mounted_prefix = '')
-      warn "[DEPRECATION WARNING]: AePageObjects::RakeRouter is deprecated and will be removed in version 2.0.0."
-
-      @mounted_prefix = mounted_prefix || ""
-      @routes = {}
-      route_line_regex = /(\w+)(?:\s[A-Z]+)?\s+(\/.*)\(.:format\).*$/
-
-      rake_routes.split("\n").each do |line|
-        line = line.strip
-        matches = route_line_regex.match(line)
-        if matches
-          @routes[matches[1].to_sym] = Route.new(matches[2], @mounted_prefix)
-        end
-      end
-    end
-
-    def path_recognizes_url?(path, url)
-      if path.is_a?(Symbol)
-        route = @routes[path]
-        route && route.matches?(url)
-      else
-        super
-      end
-    end
-
-    def generate_path(named_route, *args)
-      if named_route.is_a?(String)
-        return Path.new(@mounted_prefix + named_route)
-      end
-
-      if route = @routes[named_route]
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        route.generate_path(options)
-      end
-    end
-
-  private
-
-    class Path < String
-      attr_reader :params, :regex
-
-      def initialize(value)
-        super(value.gsub(/(\/)+/, '/').sub(/\(\.\:format\)$/, ''))
-
-        @params = parse_params
-        @regex  = generate_regex
-      end
-
-      def generate(param_values)
-        param_values = HashSymbolizer.new(param_values).symbolize_keys
-        @params.values.inject(self) do |path, param|
-          param.substitute(path, param_values)
-        end
-      end
-
-    private
-      def parse_params
-        # overwrite the required status with the optional
-        {}.merge(required_params).merge(optional_params)
-      end
-
-      def find_params(using_regex)
-        scan(using_regex).flatten.map(&:to_sym)
-      end
-
-      def optional_params
-        {}.tap do |optional_params|
-          find_params(/\(\/\:(\w+)\)/).each do |param_name|
-            optional_params[param_name] = Param.new(param_name, true)
-          end
-        end
-      end
-
-      def required_params
-        {}.tap do |required_params|
-          find_params(/\:(\w+)/).each do |param_name|
-            required_params[param_name] = Param.new(param_name, false)
-          end
-        end
-      end
-
-      def generate_regex
-        regex_spec = @params.values.inject(self) do |regex_spec, param|
-          param.replace_param_in_url(regex_spec)
-        end
-        Regexp.new regex_spec
-      end
-    end
-
-    class Param < Struct.new(:name, :optional)
-      include Comparable
-
-      def optional?
-        optional
-      end
-
-      def <=>(other)
-        name.to_s <=> other.name.to_s
-      end
-
-      def eql?(other)
-        name == other.name
-      end
-
-      def hash
-        name.hash
-      end
-
-      def replace_param_in_url(url)
-        if optional?
-          url.gsub("(/:#{name})", '(\/.+)?')
-        else
-          url.gsub(":#{name}", '(.+)')
-        end
-      end
-
-      def substitute(url, values)
-        if optional?
-          if values[name]
-            url.sub("(/:#{name})", "/#{values[name]}")
-          else
-            url.sub("(/:#{name})", '')
-          end
-        else
-          raise ArgumentError, "Missing required parameter '#{name}' for '#{url}' in #{values.inspect}" unless values.key? name
-          url.sub(":#{name}", values[name])
-        end
-      end
-    end
-
-    class Route
-      def initialize(spec, mounted_prefix)
-        @path = Path.new(mounted_prefix + spec)
-        @path.freeze
-      end
-
-      def matches?(url)
-        url =~ @path.regex
-      end
-
-      def generate_path(options)
-        options = HashSymbolizer.new(options).symbolize_keys
-        @path.generate(options)
-      end
-    end
-  end
-end

data/lib/ae_page_objects/util/waiter.rb

@@ -1,32 +0,0 @@
-require 'ae_page_objects/util/page_polling'
-
-module AePageObjects
-  module Waiter
-    class << self
-      include AePageObjects::PagePolling
-
-      def wait_until(timeout = nil, &block)
-        warn "[DEPRECATION WARNING]: AePageObjects::Waiter.wait_until is deprecated and will be removed in version 2.0.0. Use AePageObjects.wait_until instead."
-        wait_until_return_false(timeout, &block)
-      end
-
-      def wait_for(timeout = nil, &block)
-        warn "[DEPRECATION WARNING]: AePageObjects::Waiter.wait_for is deprecated and will be removed in version 2.0.0. Use AePageObjects.wait_until instead."
-        wait_until_return_false(timeout, &block)
-      end
-
-      def wait_until!(timeout = nil, &block)
-        warn "[DEPRECATION WARNING]: AePageObjects::Waiter.wait_until! is deprecated and will be removed in version 2.0.0. Use AePageObjects.wait_until instead."
-        poll_until(timeout, &block)
-      end
-
-      private
-
-      def wait_until_return_false(timeout, &block)
-        poll_until(timeout, &block)
-      rescue WaitTimeoutError
-        false
-      end
-    end
-  end
-end

data/lib/ae_page_objects/window.rb

@@ -1,19 +0,0 @@
-unless AePageObjects.respond_to?(:browser)
-  raise "Deprecation warnings out of date."
-end
-
-module AePageObjects
-  class Window
-    class << self
-      def all
-        warn "[DEPRECATION WARNING]: AePageObjects::Window.all is deprecated. Use AePageObjects.browser.windows()"
-        AePageObjects.browser.windows
-      end
-
-      def close_all
-        warn "[DEPRECATION WARNING]: AePageObjects::Window.close_all is deprecated. Use AePageObjects.browser.windows.close_all()"
-        all.close_all
-      end
-    end
-  end
-end