gatling 1.1.1 → 1.1.2

data/README.rdoc

@@ -64,23 +64,6 @@ If no reference image exits, the test will fail, an exception will be raised and
 
 -------------------------------------
 
-=== Training mode:
-
-Gatling can be run in training mode which will create reference images where ones do not exist.
-
-<b>CAUTION: Trainer mode will pass all the test which rely on the Gatling custom matcher, this can mean a false green build.
-Please make sure you are saving 'clean' references</b>
-
-Trainer mode will not overwrite existing references. If you are updating, just delete the old reference image.
-
-To set trainer mode, prefix rspec command line with $GATLING_TRAINER = true
-
-
-Example:
-        $GATLING_TRAINER = true rspec spec/my_spec.rb
-
--------------------------------------
-
 ==== Non-gem dependencies:
 
 Imagemagick must be installed:

data/lib/gatling.rb

@@ -21,11 +21,9 @@ module Gatling
 
       expected_reference_file = (File.join(Gatling::Configuration.path(:reference), expected_reference_filename))
 
-      if Gatling::Configuration.trainer_toggle
-        actual_image = Gatling::ImageFromElement.new(actual_element, expected_reference_filename)
-        save_image_as_reference(actual_image)
-        return true
-      end
+      if ENV['GATLING_TRAINER']
+        raise 'GATLING_TRAINER has been depreciated. Gatling will now create reference files where ones are missing. Delete bad references and re-run Gatling to re-train'
+      end  
 
       if !File.exists?(expected_reference_file)
         actual_image = Gatling::ImageFromElement.new(actual_element, expected_reference_filename)

data/lib/gatling/config.rb

@@ -5,12 +5,12 @@ module Gatling
 
     class << self
 
-      attr_accessor :reference_image_path, :trainer_toggle, :max_no_tries, :sleep_between_tries, :browser_folders
+      attr_accessor :reference_image_path, :max_no_tries, :sleep_between_tries, :browser_folders
 
       attr_reader :paths
 
       def reference_image_path
-        @reference_image_path ||= construct_path
+        construct_path
       end
 
       def max_no_tries
@@ -33,24 +33,6 @@ module Gatling
         end
       end
 
-      def trainer_toggle
-        @trainer_value = ENV['GATLING_TRAINER']
-
-        case @trainer_value
-        when nil
-          @trainer_value = nil
-        when 'true'
-          @trainer_value = true
-        when 'false'
-          @trainer_value = false
-        else
-          @trainer_value = false
-          puts 'Unknown GATLING_TRAINER argument. Please supply true, false or nil. DEFAULTING TO FALSE'
-        end
-        @trainer_toggle ||= @trainer_value ||= false
-      end
-
-
       def construct_path
         private
         reference_image_path = user_set_reference_path || default_reference_path

data/lib/gatling/version.rb

@@ -1,3 +1,3 @@
 module Gatling
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/acceptance/gatling_acceptance_spec.rb

@@ -73,35 +73,6 @@ describe 'Gatling' do
     end
   end
 
-  describe 'Gatling trainer toggle' do
-
-    it 'will save a reference file if no reference file already exists' do
-      Gatling::Configuration.trainer_toggle = true
-      File.exists?(File.join(@ref_path, "black.png")).should be_false
-      $stdout.should_receive(:puts).with "Saved #{@ref_path}/#{"black.png"} as reference"
-      black_element = element_for_spec
-
-      expect {Gatling.matches?("black.png", black_element)}.should_not raise_error
-
-      File.exists?(File.join(@ref_path, "black.png")).should be_true
-    end
-
-    it 'will warn if a reference already exists and not overwrite it' do
-      create_square_image(@ref_path, 'black')
-      Gatling::Configuration.trainer_toggle = true
-      expected_message = "#{File.join(@ref_path,"black.png")} already exists. reference image was not overwritten. " +
-                         "please delete the old file to update reference"
-      black_element = element_for_spec
-      reference_file_ctime = File.ctime(File.join(@ref_path,"black.png"))
-
-      $stdout.should_receive(:puts).with expected_message
-      Gatling.matches?("black.png", black_element).should be_true
-
-      sleep(1)
-      reference_file_ctime.eql?(File.ctime(File.join(@ref_path, "black.png"))).should be_true
-    end
-  end
-
   describe 'Gatling browser folders' do
 
     it 'should set image path according to the driver\'s browser' do

data/spec/acceptance/rspec_matcher_spec.rb

@@ -28,12 +28,5 @@ describe 'rspec matcher' do
       expect{red_element.should look_like(@black_box)}.should raise_error
     end
 
-    it 'will return true if it makes a new reference image in trainer mode' do
-      Gatling::Configuration.trainer_toggle =  true
-      black_element = element_for_spec("#black")
-      black_element.should look_like(@black_box)
-      File.exists?(File.join(@ref_path, @black_box)).should be_true
-    end
-
   end
 end

data/spec/configuration_spec.rb

@@ -35,12 +35,12 @@ describe Gatling::Configuration do
       end
 
       it "should be overrideable in a rails environment" do
-        subject.reference_image_path = "my custom path"
+        Gatling.reference_image_path = "my custom path"
         Gatling::Configuration.reference_image_path.should eql("my custom path")
       end
 
       it 'should return the directory for a type of image' do
-        Gatling::Configuration.reference_image_path = "a_path"
+        Gatling.reference_image_path = "a_path"
         subject.path(:temp).should == 'a_path/temp'
       end
 
@@ -87,39 +87,6 @@ describe Gatling::Configuration do
     end
   end
 
-  describe '#trainer_toggle' do
-
-    it 'should default to false' do
-      subject.trainer_toggle.should eql(false)
-    end
-
-    it 'can be toggled to true' do
-      Gatling::Configuration.trainer_toggle = true
-      subject.trainer_toggle.should eql(true)
-    end
-
-    it 'toggeled using GATLING_TRAINER = false' do
-      ENV['GATLING_TRAINER'] = 'false'
-      subject.trainer_toggle.should eql(false)
-    end
-
-    it 'toggeled using GATLING_TRAINER = true' do
-      ENV['GATLING_TRAINER'] = 'true'
-      subject.trainer_toggle.should eql(true)
-    end
-
-    it 'toggeled using GATLING_TRAINER = nil' do
-      ENV['GATLING_TRAINER'] = nil
-      subject.trainer_toggle.should eql(false)
-    end
-
-    after(:each) do
-      Gatling::Configuration.trainer_toggle = false
-      ENV['GATLING_TRAINER'] = nil
-    end
-  end
-
-
   describe "#max_no_tries" do
 
       it "should default to 5" do

data/spec/integration/gatling_integration_spec.rb

@@ -15,7 +15,6 @@ describe 'Gatling' do
 
   after(:each) do
     remove_refs(@ref_path)
-    Gatling::Configuration.trainer_toggle = false
   end
 
   describe 'Gatling, when no reference image exists' do

data/spec/spec_helper.rb

@@ -19,7 +19,6 @@ Capybara.default_driver = :selenium
 Capybara.run_server = false
 
 def config_clean_up
-  Gatling::Configuration.trainer_toggle = false
   Gatling::Configuration.reference_image_path = nil
   Gatling::Configuration.browser_folders = false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatling
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70301900905480 !ruby/object:Gem::Requirement
+  requirement: &70284092348740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.13.1
   type: :runtime
   prerelease: false
-  version_requirements: *70301900905480
+  version_requirements: *70284092348740
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70301900904960 !ruby/object:Gem::Requirement
+  requirement: &70284092347260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70301900904960
+  version_requirements: *70284092347260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70301900904480 !ruby/object:Gem::Requirement
+  requirement: &70284092346420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70301900904480
+  version_requirements: *70284092346420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70301900904000 !ruby/object:Gem::Requirement
+  requirement: &70284092345580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70301900904000
+  version_requirements: *70284092345580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70301900903520 !ruby/object:Gem::Requirement
+  requirement: &70284092344680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70301900903520
+  version_requirements: *70284092344680
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
-  requirement: &70301900903040 !ruby/object:Gem::Requirement
+  requirement: &70284092343720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.8
   type: :development
   prerelease: false
-  version_requirements: *70301900903040
+  version_requirements: *70284092343720
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70301900902560 !ruby/object:Gem::Requirement
+  requirement: &70284092343120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 0.9.8.2
   type: :development
   prerelease: false
-  version_requirements: *70301900902560
+  version_requirements: *70284092343120
 description: Add visual comparison matchers for rspec
 email:
 - grotbart@gmail.com