edsl-pageobject 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44d3414e16ec1b3da3c9f0ca13363af44a345cbe3372640a4ed572e50b7337bb
-  data.tar.gz: ef97de15b9cba8623ba435959f6d58fc30e5e632313dc91a46b9740f96147bff
+  metadata.gz: 98a7fde84b1d4f6260a0f5a2a527f448611f2bd1fe9b4c42e690015007ccca41
+  data.tar.gz: b5a6ab56fb8d2546e6069d57f7481e7e0dc3a593ef4b54a45ad92e337f6be9a9
 SHA512:
-  metadata.gz: af4fde4408312d0d71321f186e026ac9f50c70b6caa3a994af48b35ecd3483b650f060a05bd25d6a5d46bbb089431edcd7ef71135b6eb06080002786959b00fd
-  data.tar.gz: 6541f0649773eab4b9646b95f54d468c46cc40806fe3cbdfde6e6493f1fad4c4fe1474f9b665df93d4fadba76e1b2bc990f60f3c2103893df01974137d3475d4
+  metadata.gz: 0e833a978ec0d86e1008bffd70cec05b3405c9397bc756c712e4d1f6ac498569f6eb6dbdcff04620348c1594e8060a33bac057a17f428006a998131c7f9ebff6
+  data.tar.gz: 944524ffa17c0a442f630127b0fd2e401344dbb5e2b4fcc64b4bf90b90942726fcf26e74e74d967f068f68ed70c1199f78cef3a225b05b33b93d2b76b25a0710

data/lib/edsl/page_object/ajax_support.rb

@@ -89,7 +89,10 @@ module EDSL
       def wait_for_ajax(timeout = 30, message = nil)
         end_time = ::Time.now + timeout
         until ::Time.now > end_time
-          return if browser.execute_script(::EDSL::PageObject::JavascriptFrameworkFacade.pending_requests) == 0
+          begin
+            return if browser.execute_script(::EDSL::PageObject::JavascriptFrameworkFacade.pending_requests) == 0
+          rescue Selenium::WebDriver::Error::UnknownError, Selenium::WebDriver::Error::JavascriptError
+          end
           sleep 0.5
         end
         message = "Timed out waiting for ajax requests to complete" unless message

data/lib/edsl/page_object/page.rb

@@ -53,6 +53,13 @@ module EDSL
       def _ready?
         true
       end
+
+      def leave_page_using(method, expected_url = nil)
+        cur_url = browser.url
+        method.call if method.is_a?(Proc)
+        send(method) unless method.is_a?(Proc)
+        Watir::Wait.until { expected_url ? browser.url == expected_url : browser.url != cur_url }
+      end
     end
   end
 end

data/lib/edsl/page_object/population.rb

@@ -2,10 +2,17 @@ require 'facets/string'
 
 module EDSL
   module PageObject
+
+    def self.fixture_cache
+      @@cache ||= {}
+    end
+
     # This module serves as a mixin for element container to support populating their
     # fields via a hash.
     module Population
 
+
+
       # This method allows you to specify a function to be used to fetch fixture data,
       # given a key.  The value passed should either be a proc, or a method name for send.
       #
@@ -30,8 +37,10 @@ module EDSL
       # @param key [String, Symbol] What to fetch
       def fixture_fetch(key)
         ff = EDSL::PageObject::Population.fixture_fetcher
-        return ff.call(key) if ff.is_a?(Proc)
-        send(ff, key)
+        data = ff.call(key) if ff.is_a?(Proc)
+        data = send(ff, key) unless ff.is_a?(Proc)
+        EDSL::PageObject.fixture_cache[key] = data
+        data
       end
 
       # This method will populate the various elements within a container, using a hash.
@@ -55,7 +64,11 @@ module EDSL
         data = data.fetch(populate_key, data)
         data = data.fetch(populate_key.to_sym, data)
         data.each do |k, v|
-          send("#{k}=", v) if respond_to?("#{k}=")
+          begin
+            send("#{k}=", v) if respond_to?("#{k}=")
+          rescue Exception => ex
+            raise "#{ex.message} raised with setting #{k}"
+          end
         end
       end
 

data/lib/edsl/page_object/section.rb

@@ -30,7 +30,7 @@ module EDSL
     EDSL.extend_dsl {
       def section(name, section_class, opts)
         element(name, { how: :div, assign_method: :populate_with,
-                        wrapper_fn: lambda { |element, _container| section_class.new(element, self) } }.merge(opts))
+                        wrapper_fn: lambda { |element, container| section_class.new(element, container) } }.merge(opts))
       end
 
       alias_method :page_section, :section

data/lib/edsl/page_object/version.rb

@@ -1,5 +1,5 @@
 module EDSL
   module PageObject
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/lib/edsl/page_object/visitation.rb

@@ -1,3 +1,5 @@
+require 'page_navigation'
+
 module EDSL
   module PageObject
     module Visitable
@@ -36,6 +38,7 @@ module EDSL
 
     # Most of this is a semi-direct copy from PageObject::PageFactory
     module Visitation
+      include PageNavigation
       #
       # Create and navigate to a page object.  The navigation will only work if the
       # 'page_url' method was call on the page object.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edsl-pageobject
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Donavan Stanley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler