capybara-angular 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 693dad6d8c4ff820c47a41b26d0c680179148256
-  data.tar.gz: 72e6b43dbe008965532ddc18b864476c37f50d60
+  metadata.gz: 07bb2276413ff6990ca7a585e2466bbbaeac3f55
+  data.tar.gz: 46be6bbca846bd8e3724a601b996fc02838c6d35
 SHA512:
-  metadata.gz: a2960689f9869d6a45f269a49d60e8b6d3c42e98740b5e64a14acc029b2bdebe2dea0b5c25e9f2cf311ca5391ea71d500ea14a3364dee66ba311f4c490d3b814
-  data.tar.gz: 325b2b29a1741e706cd361bc8235bff5d1cd8f8cf2dd3accbf2c8a43ad83e58fa0968400cec6fb4431862c9d6062b35bd5dbae1ede3f9b166fdec3704256991d
+  metadata.gz: f8141edfd0b75ff1256cc2236dc4547dbc66bd8747434ff3aebc701e40c26aa68047b88ebb0c03aaa2503570ec26444d61fe91f427aa4894845026df0feafd49
+  data.tar.gz: a31a4525de002d97cd9402c28dc2314d50bf6f0cabe96b85780bf7d2a98952a5df11afe8567df5cc1a45404390c407de77062aea08e79653e153bdb6cf8a583f

data/README.md

@@ -18,6 +18,13 @@ Use it as you would use regular Capybara API, however this time, you won't face
 include Capybara::Angular::DSL
 ```
 
+If you need to run some code without caring about AngularJS, you can use `ignoring_angular` like this:
+```ruby
+ignoring_angular do
+  # Your AngularJS agnostic code goes here
+end
+```
+
 ## Limitations
 
 At the moment it works with AngularJS applications initialized with `ng-app`.

data/capybara-angular.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "poltergeist"
+  spec.add_development_dependency "puma"
 end

data/lib/capybara/angular/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Angular
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/lib/capybara/angular/waiter.js

@@ -0,0 +1,53 @@
+// This script is injected from waiter.rb.  It is responsible for setting
+// window.capybaraAngularReady when either a) angular is ready, or b)
+// it determines the page is not an angular page.
+
+(function () {
+  "use strict";
+
+  window.capybaraAngularReady = false;
+
+  function ready() {
+    window.capybaraAngularReady = true;
+  }
+
+  function angularPresent() {
+    return window.angular !== undefined;
+  }
+
+  function element() {
+    return document.querySelector("[ng-app], [data-ng-app]") || document.querySelector("body");
+  }
+
+  function elementPresent() {
+    return element() !== undefined;
+  }
+
+  function setupTestability() {
+    try {
+      angular.getTestability(element()).whenStable(ready);
+    } catch (err) {
+      ready();
+    }
+  }
+
+  function setupInjector() {
+    try {
+      angular.element(element()).injector().get("$browser").notifyWhenNoOutstandingRequests(ready);
+    } catch (err) {
+      ready();
+    }
+  }
+
+  function setup() {
+    if (!angularPresent() || !elementPresent()) {
+      ready();
+    } else if (angular.getTestability) {
+      setupTestability();
+    } else {
+      setupInjector();
+    }
+  }
+
+  setup();
+}());

data/lib/capybara/angular/waiter.rb

@@ -1,6 +1,8 @@
 module Capybara
   module Angular
     class Waiter
+      WAITER_JS = IO.read(File.expand_path "../waiter.js", __FILE__)
+
       attr_accessor :page
 
       def initialize(page)
@@ -8,23 +10,24 @@ module Capybara
       end
 
       def wait_until_ready
-        return unless angular_app?
-
-        setup_ready
-
+        return unless driver_supports_js?
         start = Time.now
+
         until ready?
+          inject_waiter
           timeout! if timeout?(start)
-          if page_reloaded_on_wait?
-            return unless angular_app?
-            setup_ready
-          end
           sleep(0.01)
         end
       end
 
       private
 
+      def driver_supports_js?
+        page.evaluate_script "true"
+      rescue Capybara::NotSupportedByDriverError
+        false
+      end
+
       def timeout?(start)
         Time.now - start > Capybara::Angular.default_max_wait_time
       end
@@ -33,37 +36,13 @@ module Capybara
         raise Timeout::Error.new("timeout while waiting for angular")
       end
 
-      def ready?
-        page.evaluate_script("window.angularReady")
-      end
-
-      def angular_app?
-        js = '!!window.angular'
-        page.evaluate_script js
-
-      rescue Capybara::NotSupportedByDriverError
-        false
-      end
-
-      def setup_ready
-        page.execute_script <<-JS
-          var el = document.querySelector('[ng-app], [data-ng-app]') || 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
+      def inject_waiter
+        return if page.evaluate_script("window.capybaraAngularReady !== undefined")
+        page.execute_script WAITER_JS
       end
 
-      def page_reloaded_on_wait?
-        page.evaluate_script("window.angularReady === undefined")
+      def ready?
+        page.evaluate_script("window.capybaraAngularReady === true")
       end
     end
   end

data/spec/capybara/angular_spec.rb

@@ -27,6 +27,16 @@ feature 'Waiting for angular' do
     timeout_page_should_have_waited
   end
 
+  scenario 'when visiting a non-angular page' do
+    open_non_angular_page
+    non_angular_page_should_load
+  end
+
+  scenario 'when visiting a non-angular page that loads angular javascript' do
+    open_non_angular_page_with_angular_javascript
+    non_angular_page_should_load
+  end
+
   def open_manual_bootstrap_page
     visit '/manual.html'
   end
@@ -39,7 +49,19 @@ feature 'Waiting for angular' do
     visit '/ng-app-not-on-body.html'
   end
 
+  def open_non_angular_page
+    visit '/non-angular-page.html'
+  end
+
+  def open_non_angular_page_with_angular_javascript
+    visit '/non-angular-page-with-angular-javascript.html'
+  end
+
   def timeout_page_should_have_waited
     expect(page).to have_content('waited')
   end
+
+  def non_angular_page_should_load
+    expect(page).to have_content('non-angular page')
+  end
 end

data/spec/public/non-angular-page-with-angular-javascript.html

@@ -0,0 +1,8 @@
+<html>
+<head>
+    <script src="/js/angular-1.5.8.js"></script>
+</head>
+<body>
+non-angular page
+</body>
+</html>

data/spec/public/non-angular-page.html

@@ -0,0 +1,6 @@
+<html>
+<head/>
+<body>
+non-angular page
+</body>
+</html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-angular
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Pawel Pierzchala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Capybara API that knows how to wait for Angular in end to end specs
 email:
 - pawelpierzchala@gmail.com
@@ -97,6 +111,7 @@ files:
 - lib/capybara/angular.rb
 - lib/capybara/angular/dsl.rb
 - lib/capybara/angular/version.rb
+- lib/capybara/angular/waiter.js
 - lib/capybara/angular/waiter.rb
 - spec/capybara/angular_spec.rb
 - spec/public/js/angular-1.5.8.js
@@ -104,6 +119,8 @@ files:
 - spec/public/manual.html
 - spec/public/ng-app-not-on-body.html
 - spec/public/ng-app.html
+- spec/public/non-angular-page-with-angular-javascript.html
+- spec/public/non-angular-page.html
 homepage: ''
 licenses:
 - MIT
@@ -124,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Stable Capybara API for AngularJS applications
@@ -135,3 +152,5 @@ test_files:
 - spec/public/manual.html
 - spec/public/ng-app-not-on-body.html
 - spec/public/ng-app.html
+- spec/public/non-angular-page-with-angular-javascript.html
+- spec/public/non-angular-page.html