capybara-widgets 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc7bc4f14123d78f55d255a47760ca2e0f2847be
-  data.tar.gz: 3417b7312006844e4342f2b9c8f84866edc6e595
+  metadata.gz: 7b6a90efedf17b2f0960750cc217dde6d049cb80
+  data.tar.gz: 73edd6777f2997aeafd5eed992def14d4f83d82f
 SHA512:
-  metadata.gz: 149746362b7e0475f2f9f4d42402ffa3febb41c854bbef7b96cc4acfcd3b3743136a6694bef9ccc798057705b1d139f82cdeb91caf6ecc97157d699606f9241c
-  data.tar.gz: a3905d13cc833bba7d966421d151f0490b68bc48c31f8a7c1a8ad633646005f74873603a6bb2e45281d3d199455b9e3c3cb1d0eed9bf3b34be9b75883591a343
+  metadata.gz: b40f627cd2fadf8d5b1212ba77fd738429b1c2a080a76ab950fb2661c38739d76237fa7229963f7b5f2e5db23f57abb33445621ae2ba9bbc38b15e9676a0ade8
+  data.tar.gz: 16b63567da4888f5a77509d5d9aeaac1bd05f7d4742aeaa0e43b5194c17ff39beaf40c5d5680acaad07c92304f18b3e3123d4a26b6de01dd8c4ce786e0bb60ef

data/lib/capybara/widgets/core/page.rb

@@ -24,26 +24,21 @@ module Capybara
       def loaded?
         result = opened?
         if self.respond_to?(:components_loaded?)
-          result = result && components_loaded?
+          result = result && self.components_loaded?
         end
         if self.respond_to?(:elements_loaded?)
-          result = result && elements_loaded?
+          result = result && self.elements_loaded?
         end
         result
       end
 
       def opened?
-        eventually do
-          result = if self.path_matcher?
-                     current_path =~ self.path_matcher
-                   elsif self.url_matcher?
-                     current_url =~ self.url_matcher
-                   else
-                     self.path?
-                     current_path =~ %r{#{Regexp.quote(self.path)}}
-                   end
-          raise "#{self.class.name} is not opened" unless result
-          result
+        if self.path_matcher?
+          has_current_path?(self.path_matcher, only_path: true)
+        elsif self.url_matcher?
+          has_current_path?(self.url_matcher, url: true)
+        else
+          has_current_path?(%r{#{Regexp.quote(self.path)}}, only_path: true)
         end
       end
 
@@ -62,3 +57,4 @@ module Capybara
   end
 end
 
+

data/lib/capybara/widgets/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Widgets
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-widgets
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Vitalii Grygoruk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler