rspec-page-regression 0.2.1 → 0.2.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ecd4be906059e77475bcdee31ccd5c5f2be3f2e
-  data.tar.gz: be30716939aa8d241cd93c2303326d43401fbec5
+  metadata.gz: 53b6e6168816a2ebc4280a5edfc30beb6ba3cff1
+  data.tar.gz: 4fbebd25f84151737f2fba2d38b4da73a09d0e5e
 SHA512:
-  metadata.gz: f5757228f947f0c20719b273431bf83dda49c000a966e9bbfa0b5c12a75cd11ffc545761ee7bda10da3fd3ea134bc7e85d60e3c74f787c5bf6ef685d78e35da9
-  data.tar.gz: fb3721fa0c53b0bd98704937cdf2ad608a5ff32e66e84e6140a02cc17ab8f7395e091ec4ca18afebfae23842f79e408b81e2638c4345c30d252dca58cb2f74e9
+  metadata.gz: e14de72676cbdbe042084cd1a6df1719d4335a1a6aec9ab2d9eb7c2fbceaeff573d43915aaf89cc3f91febe7adb927e5efd22a870e80a42bdf8f119848c52138
+  data.tar.gz: 6f55c9e7849ba912d212e9dc10d01c104f1d4fbfc2cd54775e3ac945a6b42f05f1542d4552b54664b14fe7bd371583c8b4edd1aeb755bcb1676e5376a76fda33

data/Gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'awesome_print'
-gem 'debugger'
+gem 'byebug'

data/README.md

@@ -144,6 +144,8 @@ Don't forget to include specs (`rake spec`) to verify your functionality.  Code
 
 Release Notes:
 
+* 0.2.1 - Explicit dependency on rspec ~> 2.14.0
+
 * 0.2.0 - Support selenium.  Thanks to [@edwinvdgraaf](https://github.com/edwinvdgraaf)
 
 * 0.1.2 - Remove existing difference images so they won't be shown in cases where files couldn't be differenced.

data/lib/rspec/page-regression/file_paths.rb

@@ -9,7 +9,7 @@ module RSpec::PageRegression
     def initialize(example, expected_path = nil)
       expected_path = Pathname.new(expected_path) if expected_path
 
-      descriptions = description_ancestry(example.metadata)
+      descriptions = description_ancestry(example.metadata[:example_group])
       descriptions.pop if descriptions.last =~ %r{
         ^
         (then_+)? (page_+)? (should_+)? match_expectation
@@ -37,7 +37,7 @@ module RSpec::PageRegression
 
     def description_ancestry(metadata)
       return [] if metadata.nil?
-      description_ancestry(metadata[:example_group]) << metadata[:description].parameterize("_")
+      description_ancestry(metadata[:parent_example_group]) << metadata[:description].parameterize("_")
     end
   end
 end

data/lib/rspec/page-regression/matcher.rb

@@ -5,7 +5,7 @@ module RSpec::PageRegression
   RSpec::Matchers.define :match_expectation do |expectation_path|
 
     match do |page|
-      @filepaths = FilePaths.new(example, expectation_path)
+      @filepaths = FilePaths.new(RSpec.current_example, expectation_path)
       Renderer.render(page, @filepaths.test_image)
       @comparison = ImageComparison.new(@filepaths)
       @comparison.result == :match
@@ -30,7 +30,7 @@ module RSpec::PageRegression
     end
 
     failure_message_for_should_not do |page|
-      "Test image should not match expectation image"
+      "Test image expected to not match expectation image"
     end
 
     def viewer

data/lib/rspec/page-regression/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module PageRegression
-    VERSION = "0.2.1"
+    VERSION = "0.2.99"
   end
 end

data/rspec-page-regression.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "oily_png"
   spec.add_dependency "poltergeist"
-  spec.add_dependency "rspec", "~> 2.14.0"
+  spec.add_dependency "rspec", "2.99"
   spec.add_dependency "which_works"
 
   spec.add_development_dependency "bourne"

data/spec/match_expectation_spec.rb

@@ -13,19 +13,19 @@ describe "match_expectation" do
     @match_argument = nil
   }
 
-  context "using should" do
+  context "using expect().to" do
 
     When {
       begin
-        @page.should match_expectation @match_argument
+        expect(@page).to match_expectation @match_argument
       rescue RSpec::Expectations::ExpectationNotMetError => e
         @error = e
       end
     }
 
     context "framework" do
-      Then { @driver.should have_received(:resize).with(1024, 768) }
-      Then { @driver.should have_received(:save_screenshot).with(test_path, @opts) }
+      Then { expect(@driver).to have_received(:resize).with(1024, 768) }
+      Then { expect(@driver).to have_received(:save_screenshot).with(test_path, @opts) }
 
       context "selenium" do
         Given {
@@ -39,7 +39,7 @@ describe "match_expectation" do
           @driver.unstub(:resize)
         }
 
-        Then { @window.should have_received(:resize_to).with(1024, 768) }
+        Then { expect(@window).to have_received(:resize_to).with(1024, 768) }
       end
     end
 
@@ -47,7 +47,7 @@ describe "match_expectation" do
       Given { use_test_image "A" }
       Given { use_expected_image "A" }
 
-      Then { @error.should be_nil }
+      Then { expect(@error).to be_nil }
     end
 
 
@@ -55,35 +55,35 @@ describe "match_expectation" do
       Given { use_test_image "A" }
       Given { use_expected_image "B" }
 
-      Then { @error.should_not be_nil }
-      Then { @error.message.should include "Test image does not match expected image" }
-      Then { @error.message.should =~ viewer_pattern(test_path, expected_path, difference_path) }
+      Then { expect(@error).to_not be_nil }
+      Then { expect(@error.message).to include "Test image does not match expected image" }
+      Then { expect(@error.message).to match viewer_pattern(test_path, expected_path, difference_path) }
 
-      Then { difference_path.read.should == fixture_image("ABdiff").read }
+      Then { expect(difference_path.read).to eq fixture_image("ABdiff").read }
     end
 
     context "when test image is missing" do
       Given { use_expected_image "A" }
 
-      Then { @error.should_not be_nil }
-      Then { @error.message.should include "Missing test image #{test_path}" }
-      Then { @error.message.should =~ viewer_pattern(expected_path) }
+      Then { expect(@error).to_not be_nil }
+      Then { expect(@error.message).to include "Missing test image #{test_path}" }
+      Then { expect(@error.message).to match viewer_pattern(expected_path) }
       context "with previously-created difference image" do
         Given { preexisting_difference_image }
-        Then { difference_path.should_not be_exist }
+        Then { expect(difference_path).to_not be_exist }
       end
     end
 
     context "when expected image is missing" do
       Given { use_test_image "A" }
 
-      Then { @error.should_not be_nil }
-      Then { @error.message.should include "Missing expectation image #{expected_path}" }
-      Then { @error.message.should =~ viewer_pattern(test_path) }
-      Then { @error.message.should include "mkdir -p #{expected_path.dirname} && cp #{test_path} #{expected_path}" }
+      Then { expect(@error).to_not be_nil }
+      Then { expect(@error.message).to include "Missing expectation image #{expected_path}" }
+      Then { expect(@error.message).to match viewer_pattern(test_path) }
+      Then { expect(@error.message).to include "mkdir -p #{expected_path.dirname} && cp #{test_path} #{expected_path}" }
       context "with previously-created difference image" do
         Given { preexisting_difference_image }
-        Then { difference_path.should_not be_exist }
+        Then { expect(difference_path).to_not be_exist }
       end
     end
 
@@ -91,21 +91,21 @@ describe "match_expectation" do
       Given { use_test_image "Small" }
       Given { use_expected_image "A" }
 
-      Then { @error.should_not be_nil }
-      Then { @error.message.should include "Test image size 256x167 does not match expectation 512x334" }
-      Then { @error.message.should =~ viewer_pattern(test_path, expected_path) }
+      Then { expect(@error).to_not be_nil }
+      Then { expect(@error.message).to include "Test image size 256x167 does not match expectation 512x334" }
+      Then { expect(@error.message).to match viewer_pattern(test_path, expected_path) }
       context "with previously-created difference image" do
         Given { preexisting_difference_image }
-        Then { difference_path.should_not be_exist }
+        Then { expect(difference_path).to_not be_exist }
       end
     end
 
     context "with match argument" do
       Given { @match_argument = "/this/is/a/test.png" }
-      Then { @error.message.should include "Missing expectation image /this/is/a/test.png" }
+      Then { expect(@error.message).to include "Missing expectation image /this/is/a/test.png" }
       context "with previously-created difference image" do
         Given { preexisting_difference_image }
-        Then { difference_path.should_not be_exist }
+        Then { expect(difference_path).to_not be_exist }
       end
     end
 
@@ -113,12 +113,12 @@ describe "match_expectation" do
       Given do
         RSpec::Core::Example.any_instance.stubs :metadata => {
           file_path: __FILE__,
-          description: "Then page.should match_expectation",
+          description: "Then expect(page).to match_expectation",
           example_group: { description: "parent" }
         }
       end
-      Then { @driver.should have_received(:save_screenshot).with(Pathname.new("tmp/spec/expectation/parent/test.png"), @opts) }
-      Then { @error.message.should include "Missing expectation image spec/expectation/parent/expected.png" }
+      Then { expect(@driver).to have_received(:save_screenshot).with(Pathname.new("tmp/spec/expectation/parent/test.png"), @opts) }
+      Then { expect(@error.message).to include "Missing expectation image spec/expectation/parent/expected.png" }
     end
 
     context "with page size configuration" do
@@ -127,15 +127,15 @@ describe "match_expectation" do
           config.page_size = [123, 456]
         end
       end
-      Then { @driver.should have_received(:resize).with(123, 456) }
+      Then { expect(@driver).to have_received(:resize).with(123, 456) }
     end
 
   end
 
-  context "using should_not" do
+  context "using expect().to_not" do
     When {
       begin
-        @page.should_not match_expectation
+        expect(@page).to_not match_expectation
       rescue RSpec::Expectations::ExpectationNotMetError => e
         @error = e
       end
@@ -145,15 +145,15 @@ describe "match_expectation" do
       Given { use_test_image "A" }
       Given { use_expected_image "B" }
 
-      Then { @error.should be_nil }
+      Then { expect(@error).to be_nil }
     end
 
     context "when files match" do
       Given { use_test_image "A" }
       Given { use_expected_image "A" }
 
-      Then { @error.should_not be_nil }
-      Then { @error.message.should == "Test image should not match expectation image" }
+      Then { expect(@error).to_not be_nil }
+      Then { expect(@error.message).to eq "Test image expected to not match expectation image" }
     end
   end
 

data/spec/spec_helper.rb

@@ -19,4 +19,5 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
   config.mock_with :mocha
   config.include Helpers
+  config.raise_errors_for_deprecations!
 end

data/spec/support/helpers.rb

@@ -13,12 +13,12 @@ module Helpers
   end
 
   def getpath(root, base)
-    (root + "expectation" + group_path(example.metadata) + "#{base}.png").relative_path_from Pathname.getwd
+    (root + "expectation" + group_path(RSpec.current_example.metadata[:example_group]) + "#{base}.png").relative_path_from Pathname.getwd
   end
 
   def group_path(metadata)
     return Pathname.new("") if metadata.nil?
-    group_path(metadata[:example_group]) + metadata[:description].parameterize("_")
+    group_path(metadata[:parent_example_group]) + metadata[:description].parameterize("_")
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-page-regression
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.99
 platform: ruby
 authors:
 - ronen barzel
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: which_works
   requirement: !ruby/object:Gem::Requirement