goggles 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f33bebed8e084b7b10246e8cb66edaf1f99538
-  data.tar.gz: 6d6f9c067e9ca3b22a2223ef48c1b77199870827
+  metadata.gz: 0b8a91f4529abbd086e9e4a3e156549a3494d75b
+  data.tar.gz: b3a5aca11025edd9d6e17e8d25f12efaabd791f4
 SHA512:
-  metadata.gz: a6b72602d5cff5218ce00541f5aa034189bce018722be5ef4409d5d9712ce4eba439f1f4271f1eccc341ecea01e8909c74a95ff3d7649334bd0b4d99ee71b95b
-  data.tar.gz: a934d033c39a947d8be9195bbf954e8ea29561223fce493a39b28cc43be775f466d0aca99b2491a972c9cafb48da79163df18c75e9df3f53fbcf5a34ff384235
+  metadata.gz: 0d1962ae700d9681afff49b1aa64ac6c5389c1579b13bda95e00ffe3adb98e5c16413210a1b961972c5196525f0e2d4a139192aa18260aebebf64c759a7e8c10
+  data.tar.gz: 28ba4feca15756f1adb1e8b1959eb09a02f43efa9936f8c248589fce7ee431fff8213c1eb6bbfdcb2564c14cd7b47d7e9928dcee7e35c9398284107896e676d9

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## v0.9.0 (Apr 14, 2015)
+* `Goggles.each` accepts Array, Integer, String, and Symbol arguments.
+* Arguments passed to `Goggles.each` extend configured settings instead of replacing them.
+* Add Cucumber tests.
+
 ## v0.8.2 (Apr 10, 2015)
 * Fix another typo in the gem description.
 

data/README.md

@@ -41,10 +41,6 @@ Goggles.each([:chrome, :firefox], [1080]) do |browser|
 end
 ```
 
-**TODO**
-
-Before the 1.0.0 release, these arguments will act as additonal browsers/sizes to script against. That way, the base configuration can be extended for particular script instances.
-
 #### Screenshots
 
 Your script blocks should include the `Watir::Browser#grab_screenshot` method, which has been patched onto the browser objects yielded to your blocks. Simply give the method a description argument and the screenshot will be saved to your configured directory.

data/features/goggles.feature

@@ -0,0 +1,23 @@
+Feature: Screenshot comparison
+  As a software professional
+  I want to automate the collection and comparison of screenshots on my application
+  So I can efficiently assess visual regression
+
+  Background:
+    Given I have configured Goggles with a valid directory
+    Given I have configured Goggles for browsers at 1080 width
+
+  Scenario: Compare screenshots in two browsers at one size
+    When I use the description "search-home" in my script
+    Then I have a file called "search-home_1080/chrome_firefox_diff.png"
+    And I have a file called "search-home_1080/chrome_firefox_data.txt"
+
+  Scenario: Extending a script with more browsers and sizes
+    When I extend configuration with arguments "phantomjs, 500"
+    And I use the description "homepage" in my script
+    Then I have a file called "homepage_1080/chrome_firefox_diff.png"
+    And I have a file called "homepage_1080/chrome_firefox_data.txt"
+    And I have a file called "homepage_1080/chrome_phantomjs_diff.png"
+    And I have a file called "homepage_1080/chrome_phantomjs_data.txt"
+    And I have a file called "homepage_1080/firefox_phantomjs_diff.png"
+    And I have a file called "homepage_1080/firefox_phantomjs_data.txt"

data/features/step_definitions/goggles_steps.rb

@@ -0,0 +1,27 @@
+Given /^I have configured Goggles with a valid directory$/ do
+  @results = Pathname.new("./results").realdirpath.to_s 
+  Goggles.configure { |c| c.directory = @results }
+end
+
+Given /^I have configured Goggles for browsers at (\d+) width$/ do |width| 
+  Goggles.configure do |c|
+    c.browsers = [:chrome, :firefox]
+    c.sizes    = [width]
+  end
+end
+
+When /^I extend configuration with arguments "(.*)"$/ do |args|
+  @args = args.split(/,/).map(&:strip)
+end
+
+When /^I use the description "(.*)" in my script$/ do |desc|
+  Goggles.each(@args) do |browser|
+    browser.goto "http://google.com"
+    browser.grab_screenshot desc
+  end
+end
+
+Then /^I have a file called "(.*)"$/ do |file|
+  filepath = "#{@results}/#{file}"
+  File.exists? filepath
+end

data/features/support/env.rb

@@ -0,0 +1,5 @@
+require "goggles"
+
+After do
+  FileUtils.rm_rf @results
+end

data/goggles.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "cucumber"
 
   spec.add_runtime_dependency "watir-webdriver"
   spec.add_runtime_dependency "image_size"

data/lib/goggles.rb

@@ -9,9 +9,11 @@ module Goggles
     configuration.tap { |conf| yield conf }
   end
 
-  def each browsers = nil, sizes = nil, &block
-    browsers ||= configuration.browsers
-    sizes    ||= configuration.sizes
+  def each *instance, &block
+    args = instance.flatten.map(&:to_s)
+    
+    sizes = configuration.sizes + args.grep(/\d+/).map(&:to_i)
+    browsers = configuration.browsers + args.grep(/[^\d+]/).map(&:to_sym)
     
     browsers.product(sizes).each do |browser, size|
       Iteration.new browser, size, configuration, &block 

data/lib/goggles/version.rb

@@ -1,3 +1,3 @@
 module Goggles
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

data/spec/goggles_spec.rb

@@ -34,9 +34,56 @@ describe Goggles do
       Goggles.each { "foo" }
     end
 
-    it "accepts non-configured browser and size arguments" do
-      expect(Goggles::Iteration).to receive(:new).with(:bar, 300, config)
-      Goggles.each([:bar], [300]) { "foo" }
+    context "when given a browser argument" do
+      it "extends the configured browser list with the given browser" do
+        expect(Goggles::Iteration).to receive(:new).with(:foo, 500, config)
+        expect(Goggles::Iteration).to receive(:new).with(:bar, 500, config)
+        Goggles.each(:bar) { "foo" }
+      end
+    end
+
+    context "when given a size argument" do
+      it "extends the configured size list with the given size" do
+        expect(Goggles::Iteration).to receive(:new).with(:foo, 500, config)
+        expect(Goggles::Iteration).to receive(:new).with(:foo, 250, config)
+        Goggles.each(250) { "foo" }
+      end      
+    end
+
+    context "when given multiple browser and size arguments" do
+      it "extends the configuration with correctly" do
+        [:foo, :bar, :baz].product([500, 1000, 250]).each do |b, s|
+          expect(Goggles::Iteration).to receive(:new).with(b, s, config)
+        end
+        Goggles.each(:bar, :baz, 1000, 250) { "foo" }
+      end
+
+      context "in no particular order" do
+        it "extends the configuration with the correct arguments" do
+          [:foo, :bar, :baz].product([500, 1000, 250]).each do |b, s|
+            expect(Goggles::Iteration).to receive(:new).with(b, s, config)
+          end
+          Goggles.each(1000, :bar, :baz, 250) { "foo" }
+        end
+      end
+    end
+
+    context "when given arguments in arrays" do
+      it "extends the configuration correctly" do
+        [:foo, :bar, :baz].product([500, 1000, 250]).each do |b, s|
+          expect(Goggles::Iteration).to receive(:new).with(b, s, config)
+        end
+        Goggles.each([:bar, :baz], [250, 1000]) { "foo" }
+      end
+    end
+
+    context "when given arguments of various classes" do
+      it "extends the configuration correctly" do
+        [:foo, :bar, :baz].product([500, 1000, 250]).each do |b, s|
+          expect(Goggles::Iteration).to receive(:new).with(b, s, config)
+        end
+        Goggles.each([:bar, "baz"], 250, "1000") { "foo" }
+      end
     end
     
     it "returns a comparison object" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goggles
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Johnson Denen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +107,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- features/goggles.feature
+- features/step_definitions/goggles_steps.rb
+- features/support/env.rb
 - goggles.gemspec
 - lib/goggles.rb
 - lib/goggles/comparison.rb
@@ -129,6 +146,9 @@ signing_key:
 specification_version: 4
 summary: Compare screenshots in different browsers at different sizes
 test_files:
+- features/goggles.feature
+- features/step_definitions/goggles_steps.rb
+- features/support/env.rb
 - spec/goggles/comparison_spec.rb
 - spec/goggles/configuration_spec.rb
 - spec/goggles/iteration_spec.rb