capybara-angular 0.0.3 → 0.0.4

data/lib/capybara/angular/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Angular
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/capybara/angular/waiter.rb

@@ -15,6 +15,7 @@ module Capybara
         start = Time.now
         until ready?
           timeout! if timeout?(start)
+          setup_ready if page_reloaded_on_wait?
           sleep(0.01)
         end
       end
@@ -34,13 +35,19 @@ module Capybara
       end
 
       def angular_app?
-        page.evaluate_script "(typeof $ != 'undefined') && $('[ng-app]').length > 0"
+        begin
+          js = "(typeof angular !== 'undefined') && "
+          js += "angular.element(document.querySelector('[ng-app]')).length > 0"
+          page.evaluate_script js
+        rescue Capybara::NotSupportedByDriverError
+          false
+        end
       end
 
       def setup_ready
         page.execute_script <<-JS
           window.angularReady = false;
-          var app = $('*[ng-app]');
+          var app = angular.element(document.querySelector('[ng-app]'));
           var injector = app.injector();
 
           injector.invoke(function($browser) {
@@ -50,6 +57,10 @@ module Capybara
           });
         JS
       end
+      
+      def page_reloaded_on_wait?
+        page.evaluate_script("window.angularReady === undefined")
+      end
     end
   end
 end

metadata

@@ -1,71 +1,60 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: capybara-angular
-version: !ruby/object:Gem::Version
-  version: 0.0.3
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.4
 platform: ruby
-authors:
+authors: 
 - Pawel Pierzchala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-03-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id003
 description: Capybara API that knows how to wait for Angular in end to end specs
-email:
+email: 
 - pawelpierzchala@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -76,35 +65,38 @@ files:
 - lib/capybara/angular/dsl.rb
 - lib/capybara/angular/version.rb
 - lib/capybara/angular/waiter.rb
-homepage: ''
-licenses:
+homepage: ""
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -575955853
+      segments: 
       - 0
-      hash: -926384177
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -575955853
+      segments: 
       - 0
-      hash: -926384177
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Stable Capybara API for AngularJS applications
 test_files: []
+