utensils 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c733878535e6fbc196017ada0c7d944f6645698
-  data.tar.gz: a7b38404e9e02abfaedffce8e68d5d90435c8e6f
+  metadata.gz: fa13c9cc6c23f59e2154c6ab07af4ced90124281
+  data.tar.gz: 345de22c5d7ba9fed713f4cb0f15fab326aee340
 SHA512:
-  metadata.gz: b9594fd020088827b112a9ee2571606caaebc632f3a84d66546cd7a1a4c8f3944f56fc7c21fe43bb709b30ac8dca90d8b99e804df25b1a7ec966cac0f63de9f8
-  data.tar.gz: 725fb5305df04218f6af6abde9b75e03d67250cfbf3ceb9b5b4e148512ee5b4f93e3ec793dec971792d171ff923b9d58e8a2a5102cd26c39593944e166010eee
+  metadata.gz: 7694526df301f3dc2e74ef77c3149e1031c6a33bad55a14f695df174d62cbd33dae55718327dc9bceca45ef9eb4cf80217328db5709ed465b57c5ccad4fa5b95
+  data.tar.gz: cf2e151022a1dfa5e4dbe9ce27f4d6b5f6211f4a524533d4ec7c611d8a310d051a4026393be596b50226f55fb082baecbc2124fe77c7a8899c8a60d7e766cfa4

data/README.md

@@ -21,7 +21,6 @@ require 'utensils/custom_matchers'
 require 'utensils/database_cleaner'
 require 'utensils/factory_girl'
 require 'utensils/omniauth'
-require 'utensils/spring'
 require 'utensils/timecop'
 require 'utensils/upload_macros'
 require 'utensils/vcr'
@@ -83,10 +82,6 @@ stub_oauth_error(:facebook)
 login(user)
 ```
 
-### spring
-
-Reloads factories because spring doesn't
-
 ### timecop
 
 Resets timecop after each spec

data/lib/utensils/custom_matchers.rb

@@ -72,7 +72,11 @@ module Utensils
 
       def matches?(page)
         @page = page
-        @image.is_a?(String) ? find_by_url : find_dragonfly_image
+        if @image.is_a?(String)
+          find_by_url || find_lazy_loaded_image
+        else
+          find_dragonfly_image
+        end
       end
 
       def failure_message
@@ -85,25 +89,29 @@ module Utensils
 
       private
 
-      def find_by_url
-        @page.has_css?("img[src$='#{@image}']")
-      end
+        def find_by_url
+          @page.has_css?("img[src$='#{@image}']")
+        end
 
-      def find_dragonfly_image
-        @page.all('img').each do |img|
-          url = img['src']
-          dragonfly_hash = url[/media\/([^\/.]+)/, 1]
-          if dragonfly_hash
-            begin
-              dragonfly_job = Dragonfly::Job.deserialize(dragonfly_hash, Dragonfly[:images])
-              return true if dragonfly_job.uid == @image.send(:uid)
-            rescue Dragonfly::Serializer::BadString
-              next
+        def find_lazy_loaded_image
+          @page.has_css?("img[data-original$='#{@image}']")
+        end
+
+        def find_dragonfly_image
+          @page.all('img').each do |img|
+            url = img['src']
+            dragonfly_hash = url[/media\/([^\/.]+)/, 1]
+            if dragonfly_hash
+              begin
+                dragonfly_job = Dragonfly::Job.deserialize(dragonfly_hash, Dragonfly[:images])
+                return true if dragonfly_job.uid == @image.send(:uid)
+              rescue Dragonfly::Serializer::BadString
+                next
+              end
             end
           end
+          return false
         end
-        return false
-      end
     end
 
     def have_image(image_url)

data/lib/utensils/version.rb

@@ -1,3 +1,3 @@
 module Utensils
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utensils
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies: []
 description: Rspec stuff we use over and over again
 email:
@@ -30,7 +30,6 @@ files:
 - lib/utensils/database_cleaner.rb
 - lib/utensils/factory_girl.rb
 - lib/utensils/omniauth.rb
-- lib/utensils/spring.rb
 - lib/utensils/timecop.rb
 - lib/utensils/upload_macros.rb
 - lib/utensils/vcr.rb
@@ -55,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rspec stuff we use over and over again

data/lib/utensils/spring.rb

@@ -1,5 +0,0 @@
-RSpec.configure do |config|
-  config.before(:all) do
-    FactoryGirl.reload
-  end
-end