gatling 1.0.7 → 1.0.8

data/spec/image_spec.rb

@@ -3,19 +3,22 @@ require 'spec_helper'
 describe Gatling::Image do
 
   before :all do
-    Gatling::Configuration.reference_image_path = './image_tests'
+    ref_path = './image_tests'
+    Gatling::Configuration.reference_image_path = ref_path
+    @expected_path = File.join ref_path, 'temp'
+    @expected_full_path = File.join @expected_path, 'image.png'
   end
 
   describe 'should initialize from' do
 
     it 'image file type' do
-        File.stub(:exists?).and_return true
-        image_mock = mock(Magick::Image)
-        Magick::Image.should_receive(:read).with('./image_tests/image.png').and_return([image_mock])
+      File.stub(:exists?).and_return true
+      image_mock = mock(Magick::Image)
+      Magick::Image.should_receive(:read).with('./image_tests/image.png').and_return([image_mock])
 
-        subject = Gatling::Image.new(:from_file, 'image.png')
-        subject.image.should == image_mock
-        subject.file_name.should == 'image.png'
+      subject = Gatling::ImageFromFile.new("image.png")
+      subject.image.should == image_mock
+      subject.file_name.should == 'image.png'
     end
 
     it 'web element type' do
@@ -25,38 +28,69 @@ describe Gatling::Image do
 
       Gatling::CaptureElement.should_receive(:new).and_return mock_capture_element
       mock_capture_element.should_receive(:capture).and_return mock_image
-      subject = Gatling::Image.new(:from_element, 'image.png', mock_element)
+      subject = Gatling::ImageFromElement.new(mock_element, "image.png")
       subject.image.should == mock_image
       subject.file_name.should == 'image.png'
     end
 
     it 'diff image' do
-       mock_image = mock(Magick::Image)
-       subject = Gatling::Image.new(:from_diff, 'image.png', mock_image)
-       subject.image.should == mock_image
-       subject.file_name.should == 'image.png'
+      mock_image = mock(Magick::Image)
+      subject = Gatling::Image.new(mock_image, 'image.png')
+      subject.image.should == mock_image
+      subject.file_name.should == 'image.png'
     end
   end
 
-  it 'should be ok with nil' do
-    pending
-  end
+  describe "Images file handling" do
 
-  it 'should save an image to the path for the type' do
-    mock_image = mock(Magick::Image)
-    mock_image.should_receive(:write).with('./image_tests/temp/image.png').and_return()
-    subject = Gatling::Image.new(:from_diff, 'image.png', mock_image)
-    subject.image = mock_image
-    subject.file_name = 'image.png'
-    subject.save(:as => :temp)
-    subject.path.should == './image_tests/temp/image.png'
-  end
+    before :each do
+
+    end
+
+    it 'will save an image to the correct path for the type' do
+      mock_image = mock(Magick::Image)
+      mock_image.should_receive(:write).with('./image_tests/temp/image.png').and_return()
+      subject = Gatling::Image.new(mock_image, 'image.png')
+      subject.image = mock_image
+      subject.file_name = 'image.png'
+      subject.save(:as => :temp)
+    end
+
+    it 'will create directory, then save and image if directory doesnt exist' do
+
+      mock_image = stub(Magick::Image)
+      mock_image.should_receive(:write).with(@expected_full_path).and_return()
 
-  it 'should check if a file exists, with the file name and type' do
-    mock_image = mock(Magick::Image)
-    File.should_receive(:exists?).with './image_tests/image.png'
-    subject = Gatling::Image.new(:from_diff, 'image.png', mock_image)
-    subject.file_name = 'image.png'
-    subject.exists?
+      File.should_receive(:exists?).with(@expected_path).and_return(false)
+      FileUtils.should_receive(:mkdir_p).with(@expected_path)
+      subject = Gatling::Image.new(mock_image, 'image.png')
+
+      subject.save(:as => :temp)
+      subject.path.should == @expected_full_path
+    end
+
+    it 'will save and image if directory exista' do
+      mock_image = stub(Magick::Image)
+      mock_image.should_receive(:write).with(@expected_full_path).and_return()
+
+      File.should_receive(:exists?).with(@expected_path).and_return(true)
+      FileUtils.should_not_receive(:mkdir_p)
+      subject = Gatling::Image.new(mock_image, 'image.png')
+
+      subject.save(:as => :temp)
+      subject.path.should == @expected_full_path
+    end
+
+    it 'should check if a file exists, with the file name and type' do
+      mock_image = mock(Magick::Image)
+      File.should_receive(:exists?).with './image_tests/image.png'
+      subject = Gatling::Image.new(mock_image, 'image.png')
+      subject.file_name = 'image.png'
+      subject.exists?
+    end
   end
+
+
 end
+
+describe Gatling::ImageFromElement

data/spec/integration/gatling_integration_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+include Capybara::DSL
+
+describe 'Gatling' do
+
+  before(:all) do
+    @spec_support_root = spec_support_root
+    @black_box = 'black.png'
+    @red_box = 'red.png'
+  end
+
+  before(:each) do
+    @ref_path = Gatling::Configuration.reference_image_path = File.join(spec_support_root, 'ref_path')
+  end
+
+  after(:each) do
+    remove_refs(@ref_path)
+    Gatling::Configuration.trainer_toggle = false
+  end
+
+  describe 'Gatling, when no reference image exists' do
+
+    it "will notify that no reference image exists and create a candidate image" do
+      pending
+      mock_element = mock
+      mock_element.stub(:native).and_return(mock_element)
+
+      expected_error = "The design reference #{@black_box} does not exist, #{@ref_path}/candidate/#{@black_box} " +
+                       "is now available to be used as a reference. " +
+                       "Copy candidate to root reference_image_path to use as reference"
+
+      expect {Gatling.matches?(@black_box, mock_element)}.should raise_error(RuntimeError, expected_error)
+
+      File.exists?(File.join(@ref_path, 'candidate', @black_box)).should be_true
+    end
+  end
+end

data/spec/support/assets/fruit_app.html

@@ -2,10 +2,21 @@
         "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
+	<style type="text/css">
+	div.ex
+	{
+	width:220px;
+	padding:10px;
+	border:5px solid gray;
+	margin:0px;
+	}
+	</style>
     <title>The Smiley Site</title>
 </head>
 <body>
+	<div class='ex' id="box">
     <img src='./black.png' id="black"/>
     <img src='./red.png' id="red"/>
+	</div>
 </body>
 </html>

metadata

@@ -1,60 +1,93 @@
 --- !ruby/object:Gem::Specification
 name: gatling
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
-- Gabriel Rotbart, Amanda Koh
+- Gabriel Rotbart, Amanda Koh, Mike Bain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70287958354680 !ruby/object:Gem::Requirement
+  requirement: &70304962876040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.1
   type: :runtime
   prerelease: false
-  version_requirements: *70287958354680
+  version_requirements: *70304962876040
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70287958354160 !ruby/object:Gem::Requirement
+  requirement: &70304962875260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70287958354160
+  version_requirements: *70304962875260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70287958353700 !ruby/object:Gem::Requirement
+  requirement: &70304962874240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70287958353700
+  version_requirements: *70304962874240
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70287958353180 !ruby/object:Gem::Requirement
+  requirement: &70304962873720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70287958353180
+  version_requirements: *70304962873720
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70304962873040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *70304962873040
+- !ruby/object:Gem::Dependency
+  name: rspec-instafail
+  requirement: &70304962872180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.8
+  type: :development
+  prerelease: false
+  version_requirements: *70304962872180
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70304962920060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8.2
+  type: :development
+  prerelease: false
+  version_requirements: *70304962920060
 description: Add visual comparison matchers for rspec
 email:
 - grotbart@gmail.com
@@ -64,7 +97,6 @@ extra_rdoc_files: []
 files:
 - .DS_Store
 - .gitignore
-- .rbenv-version
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -76,20 +108,21 @@ files:
 - lib/gatling/capture_element.rb
 - lib/gatling/comparison.rb
 - lib/gatling/config.rb
-- lib/gatling/file_helper.rb
 - lib/gatling/image.rb
 - lib/gatling/image_wrangler.rb
 - lib/gatling/matchers/look_like_matcher.rb
 - lib/gatling/version.rb
 - pkg/gatling-0.0.1.gem
 - reports/rspec_unit_test_output.html
+- spec/acceptance/gatling_acceptance_spec.rb
+- spec/acceptance/rspec_matcher_spec.rb
 - spec/capture_spec.rb
 - spec/comparison_spec.rb
 - spec/configuration_spec.rb
-- spec/file_helper_spec.rb
 - spec/gatling_spec.rb
 - spec/image_spec.rb
 - spec/image_wrangler_spec.rb
+- spec/integration/gatling_integration_spec.rb
 - spec/rspec_matcher_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -114,18 +147,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gatling
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Automated visual testing
 test_files:
+- spec/acceptance/gatling_acceptance_spec.rb
+- spec/acceptance/rspec_matcher_spec.rb
 - spec/capture_spec.rb
 - spec/comparison_spec.rb
 - spec/configuration_spec.rb
-- spec/file_helper_spec.rb
 - spec/gatling_spec.rb
 - spec/image_spec.rb
 - spec/image_wrangler_spec.rb
+- spec/integration/gatling_integration_spec.rb
 - spec/rspec_matcher_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p125

data/lib/gatling/file_helper.rb

@@ -1,17 +0,0 @@
-module Gatling
-  class FileHelper
-    class << self
-
-      def make_required_directories
-        Gatling::Configuration.paths.each { | key, directory | make_dir directory  }
-      end
-
-      private
-
-      def make_dir(path)
-        FileUtils::mkdir_p(File.join(path))
-      end
-      
-    end
-  end
-end

data/spec/file_helper_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe Gatling::FileHelper do
-
-  describe ':make_dir' do
-    before :all do
-      Gatling::Configuration.reference_image_path = './gatling' 
-    end
-
-    it 'should make required directories' do
-      FileUtils.should_receive(:mkdir_p).with './gatling/candidate'
-      FileUtils.should_receive(:mkdir_p).with './gatling/diff'
-      FileUtils.should_receive(:mkdir_p).with './gatling'
-      FileUtils.should_receive(:mkdir_p).with './gatling/temp'  
-      Gatling::FileHelper.make_required_directories
-    end
-  end
-end