capybara-angular 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc5163484b2fb235380f17e2212c65d4c2712eab
-  data.tar.gz: 66e006bcf4a55aa1a7eebf2e7e0d65c82ce59a89
+  metadata.gz: fb7cac0f774a56afa92223cfedc9904bead05ddf
+  data.tar.gz: 45c152c893570c9fd7efe10083e2679c030a6e48
 SHA512:
-  metadata.gz: fd74d7bd3463c6788ef04d129e48cfea3185799896339c15f772a3665f18739635f60bf71d84eee9a0712af0c9bef3169b8a5ea2e6c35daecf0d3ac3aec14050
-  data.tar.gz: da36d777b618cd679d95c416406aa746a9c50c3bbee91e0bebc43da56bb1dc0524d245e40eff42fde375b4094dbcc809cbd9d585b55b4504bfe6b7521a1a3c6c
+  metadata.gz: 3d286117b6cd5b5478caab4660cabb4ab359285f19e6afa0b2de47fccb88ab6d9f275164732267e54d111d6f0e3c77422a17f4dde11a41ff67e2e20132d667ef
+  data.tar.gz: f74fe7c012054df62cf4dfeb775a1a2c60aa85390f467f1a833b7c15335df4edb09e837fff5188c1dcf682167ed95b04d19d4021ec2d870dd321043b56f12ba1

data/lib/capybara/angular/dsl.rb

@@ -10,13 +10,20 @@ module Capybara
       end
 
       def page
-        wait_until_angular_ready
+        wait_until_angular_ready unless @ignoring_angular
         Capybara.current_session
       end
 
       def wait_until_angular_ready
         Waiter.new(Capybara.current_session).wait_until_ready
       end
+
+      def ignoring_angular
+        @ignoring_angular = true
+        yield
+      ensure
+        @ignoring_angular = false
+      end
     end
   end
 end

data/lib/capybara/angular/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Angular
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/capybara/angular/waiter.rb

@@ -48,16 +48,17 @@ module Capybara
 
       def setup_ready
         page.execute_script <<-JS
-          angular.element(document).ready(function() {
-            var app = angular.element(document.querySelector('[ng-app], [data-ng-app]'));
-            var injector = app.injector();
-            injector.invoke(['$browser', function($browser) {
-              window.angularReady = false;
-              $browser.notifyWhenNoOutstandingRequests(function() {
-                window.angularReady = true;
-              });
-            }]);
-          });
+          var el = document.querySelector('body')
+          window.angularReady = false;
+
+          if (angular.getTestability) {
+            angular.getTestability(el).whenStable(function() { window.angularReady = true; });
+          } else {
+            var $browser = angular.element(el).injector().get('$browser');
+
+            if ($browser.outstandingRequestCount > 0) { window.angularReady = false; }
+            $browser.notifyWhenNoOutstandingRequests(function() { window.angularReady = true; });
+          }
         JS
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-angular
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Pawel Pierzchala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara