angular_webdriver 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f37457d0ef4a33d6270ff82c314b816287f340
-  data.tar.gz: f322210de5d4c17b9cc69c544399f793f0e5f901
+  metadata.gz: 0ebe9dcced61bdcd80e99c422bafb5416a97e142
+  data.tar.gz: b3c166bc7ce00fae03a6dbe77c61c2352edff096
 SHA512:
-  metadata.gz: b26d552ec0240432af01e600c4936e5ecce7e014275168df066e3fb99d3b51e9db6b74b1c283730f29fe3d1ac393a29f8df42a5402349a0e6757410f1790c94f
-  data.tar.gz: 6322971ae12c782a76058ba8355e8ac1a526ff9dfbf4fab50180080eb5017faa4537ef4bb217bf7db883a0311616b43a1c8dcc91bd0336f98bc859e087f87225
+  metadata.gz: ff7d5236328e971370c1871c6851edbdf468377f1e3fdddbaba2d7ec8fa8c8dc0220eeabc6f5d58a31c22ba7614acf2767dd808824478fc64699ca7ca8df8e7e
+  data.tar.gz: 919f103503af4df1cfe3c306b382594191ad2a9104adbe16d0822e9d3d591e60a22bbf00beafe48e1b0aad4b2457e415c0b51e10bd612acdab719588a8f3cf54

data/docs/overview.md

@@ -99,3 +99,7 @@ reimplemented client side to avoid flakiness.
 **driver.set_max_wait(5)** - wait up to 5 seconds for an exception to not be raised
                              when finding an element.
 **driver.max_wait_seconds** - The max wait amount (default 0) in seconds.
+**driver.set_max_page_wait(30)** - wait up to 30 seconds for pages to load via
+                                 protractor.get
+**driver.max_page_wait_seconds** - The max wait amount (default 30) in seconds
+                                   for pages to load via protractor.get.

data/lib/angular_webdriver/protractor/protractor.rb

@@ -82,9 +82,10 @@ class Protractor
   #  expect(browser.getCurrentUrl()).toBe('https://angularjs.org/');
   #
   # @param destination [String] The destination URL to load, can be relative if base_url is set
-  # @param opt_timeout [Integer] Number of seconds to wait for Angular to start. Default 30.
+  # @param opt_timeout [Integer] Number of seconds to wait for Angular to start.
+  #                              Default 30
   #
-  def get destination, opt_timeout=30
+  def get destination, opt_timeout=driver.max_page_wait_seconds
     # do not use driver.get because that redirects to this method
     # instead driver_get is provided.
 
@@ -130,7 +131,7 @@ class Protractor
     # now that the url has changed, make sure Angular has loaded
     # note that the mock module logic is omitted.
     #
-    waitForAngular
+    waitForAngular description: 'Protractor.get', timeout: timeout
   end
 
   # Invokes the underlying driver.get. Does not wait for angular.
@@ -318,7 +319,7 @@ class Protractor
     )
     must_sync         = sync_whitelist.include? webdriver_command
 
-    self.waitForAngular if must_sync
+    waitForAngular if must_sync
   end
 
   # Instruct webdriver to wait until Angular has finished rendering and has
@@ -326,23 +327,33 @@ class Protractor
   # Note that Protractor automatically applies this command before every
   # WebDriver action.
   #
-  # @param [String] opt_description An optional description to be added
-  #     to webdriver logs.
+  # Will wait up to driver.max_wait_seconds (set with driver.set_max_wait)
+  #
+  # @param [Hash] opts
+  # @option opts [String] :description An optional description to be added
+  #                                    to webdriver logs.
+  # @option opts [Integer] :timeout Amount of time in seconds to wait for
+  #                                 angular to load. Default driver.max_wait_seconds
   # @return [WebDriver::Element, Integer, Float, Boolean, NilClass, String, Array]
   #
-  def waitForAngular opt_description='' # Protractor.prototype.waitForAngular
+  def waitForAngular opts={} # Protractor.prototype.waitForAngular
     return if ignore_sync
 
-    begin
-      # the client side script will return a string on error
-      # the string won't be raised as an error unless we explicitly do so here
-      error = executeAsyncScript_(client_side_scripts.wait_for_angular,
-                                  "Protractor.waitForAngular() #{opt_description}",
-                                  root_element)
-      raise Selenium::WebDriver::Error::JavascriptError, error if error
-    rescue Exception => e
-      # https://github.com/angular/protractor/blob/master/docs/faq.md
-      raise e.class, "Error while waiting for Protractor to sync with the page: #{e}"
+    description = opts.fetch(:description, '')
+    timeout     = opts.fetch(:timeout, driver.max_wait_seconds)
+
+    wait(timeout: timeout, bubble: true) do
+      begin
+        # the client side script will return a string on error
+        # the string won't be raised as an error unless we explicitly do so here
+        error = executeAsyncScript_(client_side_scripts.wait_for_angular,
+                                    "Protractor.waitForAngular() #{description}",
+                                    root_element)
+        raise Selenium::WebDriver::Error::JavascriptError, error if error
+      rescue Exception => e
+        # https://github.com/angular/protractor/blob/master/docs/faq.md
+        raise e.class, "Error while waiting for Protractor to sync with the page: #{e}"
+      end
     end
   end
 

data/lib/angular_webdriver/protractor/webdriver_patch.rb

@@ -37,7 +37,25 @@ module Selenium
       # waiting for angular to load.
       #
       def max_wait_seconds
-        @bridge.max_wait_seconds
+        @bridge.max_wait_seconds || 0
+      end
+
+      # Sets the wait time in seconds used when loading pages with protractor.get
+      #
+      # @param value [Numeric] the amount of time to wait in seconds
+      #
+      # @return [Numeric] the wait time in seconds
+      def set_max_page_wait value
+        @max_page_wait = value
+      end
+
+      # Gets the wait time in seconds used when loading pages with protractor.get
+      #
+      # Defaults to 30 seconds
+      #
+      # @return [Numeric] the wait time in seconds
+      def max_page_wait_seconds
+        @max_page_wait || 30
       end
     end
 

data/lib/angular_webdriver/version.rb

@@ -1,4 +1,4 @@
 module AngularWebdriver
-  VERSION = '1.0.0' unless defined? ::AngularWebdriver::VERSION
-  DATE    = '2015-06-06' unless defined? ::AngularWebdriver::DATE
+  VERSION = '1.0.1' unless defined? ::AngularWebdriver::VERSION
+  DATE    = '2015-06-07' unless defined? ::AngularWebdriver::DATE
 end

data/release_notes.md

@@ -1,3 +1,11 @@
+#### v1.0.1 2015-06-07
+
+- [afb8d22](https://github.com/bootstraponline/angular_webdriver/commit/afb8d228f087c897ce35deaeace4adbbe63eac25) Release 1.0.1
+- [449c605](https://github.com/bootstraponline/angular_webdriver/commit/449c605d9c43972296d6f04a8f860d43813d1b36) Update wait logic and fix tests
+- [7f133c0](https://github.com/bootstraponline/angular_webdriver/commit/7f133c0a16ca3303f18c0ec99519e066933d85fd) waitForAngular now waits driver.max_wait_seconds
+- [36a1e1a](https://github.com/bootstraponline/angular_webdriver/commit/36a1e1a8093b4c13db6a7ba2cc551cffecbb00e8) Remove unnecessary include
+
+
 #### v1.0.0 2015-06-06
 
 - [8291152](https://github.com/bootstraponline/angular_webdriver/commit/82911526e99411420ef5bde4cc5dba652cc514ed) Release 1.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angular_webdriver
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver