gatling 0.9.9 → 1.0.0

data/lib/gatling.rb

@@ -5,20 +5,23 @@ module Gatling
       
       #TODO: Training mode
       #TODO: Diff with reports
-      #TODO: Canidate in spec
       #TODO: Fuzz matches
       #TODO: Helpers for cucumber
 
       def initialize expected, actual
         @expected = expected
         @actual = actual
+
+        @reference_image_path = Gatling::Configuration.reference_image_path
+        @expected_image = "#{@reference_image_path}/#{@expected}"
+        @expected_filename = "#{@expected}".sub(/\.[a-z]*/,'')
       end
 
-            
+
       def capture
         temp_dir = "#{@reference_image_path}/temp"
         
-        FileUtils::mkdir_p(temp_dir) unless File.exists?(temp_dir)
+        FileUtils::mkdir_p(temp_dir)
         
         #captures the uncropped full screen
         page.driver.browser.save_screenshot("#{temp_dir}/temp.png")
@@ -34,27 +37,42 @@ module Gatling
 
       def save_crop_as_reference(cropped_element)
         candidate_path = "#{@reference_image_path}/candidate"
-        
-        FileUtils::mkdir_p(candidate_path) unless File.exists?(candidate_path)
-           
-        filename = "#{@expected}".sub(/\.[a-z]*/,'')
-        cropped_element.write("#{candidate_path}/#{filename}_candidate.png")
-        candidate = "#{candidate_path}/#{filename}_candidate.png"
-      end   
+
+        FileUtils::mkdir_p(candidate_path)
+
+        cropped_element.write("#{candidate_path}/#{@expected_filename}.png")
+        candidate = "#{candidate_path}/#{@expected_filename}.png"
+      end
+
+      def create_diff
+        diff_path = "#{@reference_image_path}/diff"
+
+        FileUtils::mkdir_p(diff_path)
+
+        @diff_metric.first.write("#{diff_path}/#{@expected_filename}_diff.png")
+
+        candidate = save_crop_as_reference(@cropped_element)
+        raise "element did not match #{@expected}. A diff image: #{@expected_filename}_diff.png was created in #{diff_path}. A new reference #{candidate} can be used to fix the test"
+      end
 
 
       def matches?
-        @reference_image_path = Gatling::Configuration.reference_image_path
-        cropped_element = crop_element
-        if File.exists?(@expected)
-          expected_img = Magick::Image.read(@expected).first
-          diff_metric = cropped_element.compare_channel(expected_img, Magick::MeanAbsoluteErrorMetric)
-          matches = diff_metric[1] == 0.0
-          diff_metric.first.write('diff.png') unless matches
+
+        @cropped_element = crop_element
+        if File.exists?(@expected_image)
+
+          expected_img = Magick::Image.read(@expected_image).first
+
+          @diff_metric = @cropped_element.compare_channel(expected_img, Magick::MeanAbsoluteErrorMetric)
+
+          matches = @diff_metric[1] == 0.0
+
+          create_diff unless matches
+
           matches
         else
-          candidate = save_crop_as_reference(cropped_element)
-          raise "The design reference #{@expected} does not exist, #{candidate} is now available to be used as a reference"     
+          candidate = save_crop_as_reference(@cropped_element)
+          raise "The design reference #{@expected} does not exist, #{candidate} is now available to be used as a reference. Copy candidate to root reference_image_path to use as reference"
         end    
       end      
     end
@@ -66,11 +84,14 @@ module Gatling
         attr_accessor 'reference_image_path'
 
         def reference_image_path
+          #if defined?(Rails) or @reference_image_path.nil?
+          #  @reference_image_path ||= File.join(Rails.root, 'spec/reference_images')
+          #end
           begin
-           @reference_image_path ||= File.join(Rails.root, 'spec/reference_images')
-          rescue NameError
-            puts "Not using Rails? Please set the reference_image_path"
-          end  
+          @reference_image_path ||= File.join(Rails.root, 'spec/reference_images')
+          rescue
+            raise "Not using Rails? Please set the reference_image_path"
+          end
         end
 
       end

data/lib/gatling/version.rb

@@ -1,3 +1,3 @@
 module Gatling
-  VERSION = "0.9.9"
+  VERSION = "1.0.0"
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'capybara'
 require 'capybara/dsl'
 require 'gatling'
-require 'matchers/look_like_matcher.rb'
+require 'matchers/look_like_matcher'
 
 Capybara.default_driver = :selenium
 Capybara.app_host = 'http://www.google.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatling
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70344792244780 !ruby/object:Gem::Requirement
+  requirement: &70169406514200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344792244780
+  version_requirements: *70169406514200
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70344792244340 !ruby/object:Gem::Requirement
+  requirement: &70169406513780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344792244340
+  version_requirements: *70169406513780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70344792243880 !ruby/object:Gem::Requirement
+  requirement: &70169406513260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344792243880
+  version_requirements: *70169406513260
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70344792243340 !ruby/object:Gem::Requirement
+  requirement: &70169406512760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344792243340
+  version_requirements: *70169406512760
 description: Add visual comparison matchers for rspec
 email:
 - grotbart@gmail.com