wildcard_finders 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a44948a9167397000feb8d66fc6934c901fa80
-  data.tar.gz: be4c180e8adad420445ceaac79d8ed702be9f025
+  metadata.gz: 08e9bfbc82ce9fecd8da133569bf329caba7730d
+  data.tar.gz: c6b99935e3fd5842737e3b54f10bb17513b946e6
 SHA512:
-  metadata.gz: 6eb482e38b8eb89394f53676cf2dcc60bfc97264f692ee8280ffedc27eb3291cee31185f61182e818d9ef0c4183c6100d90ce5fcd65f2593d0a3dbf47da8f470
-  data.tar.gz: 1b063c025d5f3780502d4e64054904be2fcefad013f0890285111f56676b767064cd5f90c3d3c3bfe04d6bdb5f34bb5e7c799443035d75b05545f707b3f388c2
+  metadata.gz: 92a1eb85521d0b6e6781cbcd6cff8c3ff188821c0c982312ef0c452382bbfdbb4213344f83080a743b1d32337053505d70edc3e758339f7660f96ffc8790023d
+  data.tar.gz: 1cdf1dc1497902fbf05432fd4f88f64bb5f6d1e15254ccb41406594e5f8797d8898f94caaeeb76cb42c357191f8ae2a1c3194ee2f9bce5c626c6dc3fc2747e0f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.2.0
+* CHANGE
+ * find_xxx_like raise errors when element not found
+ * find_xxx_like waits Capybara.default_wait_time
+
 # 0.1.1
 * ENHANCEMENT
  * have_xxx_like matcher allows block to use

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem "rspec-parameterized", github: "tomykaira/rspec-parameterized"

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/wildcard_finders/finders.rb

@@ -6,18 +6,31 @@ module WildcardFinders
     METHODS = []
 
     # not to add METHODS
+    # FIXME: opts is not used. what was that?
     def find_tag_like(tag, matcher = nil, opts = {}, &block)
       if matcher.is_a?(Hash) && matcher.values.all? {|v| v.is_a?(String) }
         find_exactly(tag, matcher)
       else
-        all(tag).select do |e|
-          if matcher.is_a?(Hash)
-            hash = matcher.keys.each_with_object({}) {|key, h| h[key] = e[key] }
-            WildcardMatchers.wildcard_match?(hash, matcher)
-          else
-            WildcardMatchers.wildcard_match?(e, block || matcher)
+        wait_method = respond_to?(:synchronize) ? :synchronize : :wait_until
+
+        results = []
+        __send__(wait_method) do
+          results = all(tag).select do |element|
+            if matcher.is_a?(Hash)
+              hash_from_element = matcher.keys.each_with_object({}) {|key, h| h[key] = element[key] }
+              WildcardMatchers.wildcard_match?(hash_from_element, matcher)
+            else
+              WildcardMatchers.wildcard_match?(element, block || matcher)
+            end
           end
-        end.first # not compatible with capybara 2.x
+        end
+
+        if results.empty?
+          raise Capybara::ElementNotFound, "no <#{tag}> to match #{matcher}"
+        else
+          # not compatible for capybara 2.0
+          results.first
+        end
       end
     end
 
@@ -37,11 +50,7 @@ module WildcardFinders
         x.descendant(tag.to_sym)[attr_matcher.inject(&:&)]
       end
 
-      begin
-        find(:xpath, xpath)
-      rescue Capybara::ElementNotFound
-        nil
-      end
+      find(:xpath, xpath)
     end
 
     def self.method_added(name)

data/lib/wildcard_finders/matchers.rb

@@ -19,25 +19,21 @@ module WildcardFinders
         rspec_no_matcher_method_without_block = method.to_s.sub("find", "have_no") + "_without_block"
 
         define_method(matcher_method) do |*args, &block|
-          wait_method = respond_to?(:synchronize) ? :synchronize : :wait_until
-
-          __send__(wait_method) do
-            result = __send__(method, *args, &block)
-            result or return(false)
+          begin
+            __send__(method, *args, &block)
+            true
+          rescue ::Capybara::ElementNotFound
+            false
           end
-
-          true
         end
 
         define_method(no_matcher_method) do |*args, &block|
-          wait_method = respond_to?(:synchronize) ? :synchronize : :wait_until
-
-          __send__(wait_method) do
-            result = __send__(method, *args, &block)
-            result and return(false)
+          begin
+            __send__(method, *args, &block)
+            false
+          rescue ::Capybara::ElementNotFound
+            true
           end
-
-          true
         end
 
         RSpec::Matchers.define(rspec_matcher_method_without_block) do |expected|

data/spec/wildcard_finders/finders_spec.rb

@@ -71,7 +71,7 @@ describe WildcardFinders::Finders do
       with_them do
         it "returns nil" do
           visit "/a"
-          page.find_anchor_like(attr => value).should be_nil
+          expect { page.find_anchor_like(attr => value) }.to raise_exception(Capybara::ElementNotFound)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wildcard_finders
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - okitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara