watir_angular 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92861e78110e040eac6d0d6cc163a51a39b246ff
-  data.tar.gz: 42f962e3e5e58a6b399ceaf8b7a5dfcf88a10924
+  metadata.gz: db2980821eced85f9586c90b94ce85f1f5c867ce
+  data.tar.gz: 5d3c3432cc04cc41d066f76a471445a20f7b2e1a
 SHA512:
-  metadata.gz: 5b9c5ddf6de13251fcc8a4f8b098e5c161f6fd1e9f428da08f9cf916232d2250d48429f1386380537d72fa55654579e2b2243f32fc5e3eb2c69ad45de08efc7f
-  data.tar.gz: e3fe8f2eb14adf70b99db6eeaeb404a9db47f95d7fa1dbb6f77533344b8ff66885b3e2dbf66f0d4ea94f23c8146b40ab513d93f03eb2960fba858d2fb20886bb
+  metadata.gz: 7ea3f508654b0c6d077161376151a1dcacf966240d787c0303507900952e90f1464e8c09b57320a824811f18d99e77e1b1aac852e35b3c72e7ef5e84731c7365
+  data.tar.gz: b3673e5b26784d379a9625d4c9346262c4fa79a588e497c80c7126da68bbfa8e05c85665828a4acb691c8de9edf798fdd3c82de50c582a1213ba65a3f133d5b9

data/lib/waitForAngular.js

@@ -0,0 +1,133 @@
+// Code from: https://github.com/angular/protractor/blob/a62efc6e401bc1aa7408e3008ccdaa219b528636/lib/clientsidescripts.js
+
+function(rootSelector, callback) {
+    try {
+        // Wait for both angular1 testability and angular2 testability.
+        var ng1Hooks = function getNg1Hooks(selector, injectorPlease) {
+            function tryEl(el) {
+                try {
+                    if (!injectorPlease && angular.getTestability) {
+                        var $$testability = angular.getTestability(el);
+                        if ($$testability) {
+                            return {$$testability: $$testability};
+                        }
+                    } else {
+                        var $injector = angular.element(el).injector();
+                        if ($injector) {
+                            return {$injector: $injector};
+                        }
+                    }
+                } catch(err) {}
+            }
+            function trySelector(selector) {
+                var els = document.querySelectorAll(selector);
+                for (var i = 0; i < els.length; i++) {
+                    var elHooks = tryEl(els[i]);
+                    if (elHooks) {
+                        return elHooks;
+                    }
+                }
+            }
+
+            if (selector) {
+                return trySelector(selector);
+            } else if (window.__TESTABILITY__NG1_APP_ROOT_INJECTOR__) {
+                var $injector = window.__TESTABILITY__NG1_APP_ROOT_INJECTOR__;
+                var $$testability = null;
+                try {
+                    $$testability = $injector.get('$$testability');
+                } catch (e) {}
+                return {$injector: $injector, $$testability: $$testability};
+            } else {
+                return tryEl(document.body) ||
+                    trySelector('[ng-app]') || trySelector('[ng\\:app]') ||
+                    trySelector('[ng-controller]') || trySelector('[ng\\:controller]');
+            }
+        }
+
+        var testCallback = callback;
+
+        // Wait for angular1 testability first and run waitForAngular2 as a callback
+        var waitForAngular1 = function(callback) {
+
+            if (window.angular) {
+                var hooks = ng1Hooks(rootSelector);
+                if (!hooks){
+                    callback();  // not an angular1 app
+                }
+                else{
+                    if (hooks.$$testability) {
+                        hooks.$$testability.whenStable(callback);
+                    } else if (hooks.$injector) {
+                        hooks.$injector.get('$browser')
+                            .notifyWhenNoOutstandingRequests(callback);
+                    } else if (!!rootSelector) {
+                        throw new Error(
+                            'Could not automatically find injector on page: "' +
+                            window.location.toString() + '".  Consider using config.rootEl');
+                    } else {
+                        throw new Error(
+                            'root element (' + rootSelector + ') has no injector.' +
+                            ' this may mean it is not inside ng-app.');
+                    }
+                }
+            }
+            else {callback();}  // not an angular1 app
+        };
+
+        // Wait for Angular2 testability and then run test callback
+        var waitForAngular2 = function() {
+            if (window.getAngularTestability) {
+                if (rootSelector) {
+                    var testability = null;
+                    var el = document.querySelector(rootSelector);
+                    try{
+                        testability = window.getAngularTestability(el);
+                    }
+                    catch(e){}
+                    if (testability) {
+                        return testability.whenStable(function() { testCallback(); });
+                    }
+                }
+
+                // Didn't specify root element or testability could not be found
+                // by rootSelector. This may happen in a hybrid app, which could have
+                // more than one root.
+                var testabilities = window.getAllAngularTestabilities();
+                var count = testabilities.length;
+
+                // No angular2 testability, this happens when
+                // going to a hybrid page and going back to a pure angular1 page
+                if (count === 0) {
+                    return testCallback();
+                }
+
+                var decrement = function() {
+                    count--;
+                    if (count === 0) {
+                        testCallback();
+                    }
+                };
+                testabilities.forEach(function(testability) {
+                    testability.whenStable(decrement);
+                });
+
+            }
+            else {testCallback();}  // not an angular2 app
+        };
+
+        if (!(window.angular) && !(window.getAngularTestability)) {
+            // no testability hook
+            throw new Error(
+                'both angularJS testability and angular testability are undefined.' +
+                '  This could be either ' +
+                'because this is a non-angular page or because your test involves ' +
+                'client-side navigation, which can interfere with Protractor\'s ' +
+                'bootstrapping.  See http://git.io/v4gXM for details');
+        } else {waitForAngular1(waitForAngular2);}  // Wait for angular1 and angular2
+                                                    // Testability hooks sequentially
+
+    } catch (err) {
+        callback(err.message);
+    }
+}

data/lib/watir_angular.rb

@@ -1,28 +1,17 @@
-# Code on this page is based on code by westlm1@NW110283.nwie.net
-# From https://github.com/watir/watir/pull/387
-
 require "watir"
 
 Watir::Locators::Element::SelectorBuilder.send(:remove_const, :WILDCARD_ATTRIBUTE)
 Watir::Locators::Element::SelectorBuilder::WILDCARD_ATTRIBUTE = /^(aria|data|ng)_(.+)$/
 
 module WatirAngular
-  def self.wait_for_angular(browser, timeout: Watir.default_timeout)
-    wd = browser.wd
-    angular_element = "document.querySelectorAll('[ng-app]')[0]"
-    wd.execute_script("angular.element(#{angular_element}).scope().pageFinishedRendering = false")
-    wd.execute_script("angular.getTestability(#{angular_element}).whenStable(function(){angular.element(#{angular_element}).scope().pageFinishedRendering = true})")
-    browser.wait_until(timeout: timeout, message: "waiting for angular to render") do
-      wd.execute_script("return angular.element(#{angular_element}).scope().pageFinishedRendering")
-    end
-  rescue Selenium::WebDriver::Error::InvalidElementStateError
-    # no ng-app found on page, continue as normal
-  rescue Selenium::WebDriver::Error::JavascriptError
-    # angular not used in the application, continue as normal
-  rescue Selenium::WebDriver::Error::UnknownError => ex
-    # TODO - this may be a bug in chromedriver that it is not a JavaScriptError
-    raise unless ex.message.include? "angular is not defined"
-    # angular not used in the application, continue as normal
+  def self.wait_for_angular(browser, timeout = nil)
+    browser.wd.manage.timeouts.script_timeout = timeout if timeout
+    file = File.expand_path("../waitForAngular.js", __FILE__)
+    js = File.read(file)
+    script = "return (#{js}).apply(null, arguments)"
+
+    error = browser.wd.execute_async_script(script, 'body')
+    Watir.logger.warn error if error
   end
 
   def self.inject_wait(browser)

data/watir_angular.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "watir_angular"
-  spec.version       = "0.3.0"
+  spec.version       = "0.4.0"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_angular
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir
@@ -95,6 +95,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/waitForAngular.js
 - lib/watir_angular.rb
 - watir_angular.gemspec
 homepage: http://github.com/titusfortner/watir_angular