capybara-extensions 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be82a50d10aa44c6b41eed1bdadbe9ccc47962d9
-  data.tar.gz: 66a534229850cad98e8a94c9b1a6af35c4b3c01a
+  metadata.gz: 7a7578ae423b1860a572ad5da560de3bffbd51cc
+  data.tar.gz: 80483da282e01105341220adee22a236414aed51
 SHA512:
-  metadata.gz: a9fa104f4f7223a6578ef81b9a2a3762791641a2b57e3dbec208cf9d2426f85cfda12cc4adc975e825c40f6734422b9d7b44d2de309a83b3d1845275070b223b
-  data.tar.gz: 06102011a95173369fddad6c73caf117237de3c09090c69ed0d93733cb9a76ccd1bb6c9a98793fdb122b26b18b65f8c30dc6b0ee82e49ba4be369ca9e10c15a5
+  metadata.gz: 66607ca434bc7c7e1d909b3b0034116cae887b95788af1e34123fac25f7310dc7d0afe204093e53c53226916aa834ad0fcb4231ab441e19aba863465d53c2458
+  data.tar.gz: 911eb6947f96f1e2e2125d42e89040d790fc6df5984ce204019baffd2c9fd6493e82e3de182e4d6c132040184d4d1b867e1f358133ff83b9b5dd23637d3ba657

data/lib/capybara-extensions/finders.rb

@@ -54,7 +54,7 @@ module CapybaraExtensions::Finders
 
   # Find an HTML img based on the src and/or alt values.
   #
-  # @param options [Hash] Must pass a hash containing the src and/or alt of the image sought.
+  # @param options [Hash] Must pass a hash containing the src and/or alt of the image sought. You may pass a Regexp with src; however, this should be done sparingly, as CapybaraExtensions::Locators#image_locator will find and iterate over all images in the current scope.
   # @return [Capybara::Element] the found element
   #
   def find_image(options = {})

data/lib/capybara-extensions/locators.rb

@@ -8,8 +8,16 @@ module CapybaraExtensions::Locators
   #
   def image_locator(options)
     locator = String.new
+
+    if options[:src]
+      if Regexp === options[:src] && image = _find_image_with_regex(options[:src])
+        locator.concat("[@src='#{image}']")
+      else options[:src]
+        locator.concat "[@src='#{options[:src]}']"
+      end
+    end
+
     locator.concat "[@alt='#{options[:alt]}']" if options[:alt]
-    locator.concat "[@src='#{options[:src]}']" if options[:src]
     locator
   end
 
@@ -25,4 +33,17 @@ module CapybaraExtensions::Locators
     locator.concat "[@content='#{content}']"
     locator
   end
+
+  private
+
+  def _find_image_with_regex(src)
+    all_images = all('img')
+    all_images.each do |image|
+      if image.native.attributes['src'].value.match(src).nil?
+        return nil
+      else
+        return image.native.attributes['src'].value
+      end
+    end
+  end
 end

data/lib/capybara-extensions/matchers.rb

@@ -6,7 +6,7 @@ module CapybaraExtensions::Matchers
 
   # Checks that the current node has an image with the given src or alt.
   #
-  # @param options [Hash] must pass a hash containing src and/or alt to match against.
+  # @param options [Hash] must pass a hash containing src and/or alt to match against. You may pass a Regexp with src.
   # @return [Boolean] true if the image matches.
   #
   def has_image?(options = {})

data/lib/capybara-extensions/version.rb

@@ -1,3 +1,3 @@
 module CapybaraExtensions
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/finders_test.rb

@@ -347,7 +347,16 @@ describe '.string' do
     it 'finds an image when passed src and alt' do
       string.find_image(src: 'http://example.com/johndoe', alt: 'John Doe').native.attributes['src'].value.must_equal image
       string.find_image(src: 'http://example.com/johndoe').native.attributes['src'].value.must_equal image
+      string.find_image(src: /johndo/).native.attributes['src'].value.must_equal image
       string.find_image(alt: 'John Doe').native.attributes['src'].value.must_equal image
     end
+
+    it 'returns ElementNotFound when passed invalid src or alt' do
+      assert_raises(Capybara::ElementNotFound) { string.find_image(src: 'http://example.com/johndoe', alt: 'John Doh') }
+      assert_raises(Capybara::ElementNotFound) { string.find_image(src: 'http://example.com/johndoh', alt: 'John Doe') }
+      assert_raises(Capybara::ElementNotFound) { string.find_image(src: 'http://example.com/johndoh') }
+      assert_raises(Capybara::ElementNotFound) { string.find_image(alt: 'John Doh') }
+      assert_raises(Capybara::ElementNotFound) { string.find_image(src: /johndoh/) }
+    end
   end
 end

data/test/matchers_test.rb

@@ -18,6 +18,8 @@ describe '.string' do
 
     it 'returns true if the image has an src with the argument' do
       string.has_image?(src: 'http://example.com/johndoe').must_equal true
+      string.has_image?(src: /johndo/).must_equal true
+      string.has_image?(src: /johndoh/).must_equal false
     end
 
     it 'returns false if the image does not have an src with the argument' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Michael Dupuis Jr.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder