motion-juxtapose 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 164ece95d30c7dc4d2ffa8b9598cd3d6151820a5
-  data.tar.gz: 79a2467b97e83c21f77841c3901c1b41b0125483
+  metadata.gz: 0543dfe3a91b130a2a8faf863307dd63e3ba619d
+  data.tar.gz: b12e0a693f99ef3d63eb0a73674f0ab94a232142
 SHA512:
-  metadata.gz: db4f4693c8d26620690a2066ab72d0b6f50a2687bf1d99af5bb3f6c9fb47bb7024901153aba953c3ebf100210c044137e7289942aa5bed8b10b1b7cd53eabd9b
-  data.tar.gz: 04c41f7fab50c2fff3d41b49b27c6228cca9f0850af6ecf9b37011d154810af34990c1bc256d70b02a94c8e4ed971af6be6f1c6825e54d4b01c6cfe73c40128e
+  metadata.gz: f676239c5499c311ed923ab84de8aadd96092459db5a563136352be7d828d986bbf336973313d95192910446d3e5f461268976b48782c3ec775c7a353108fd33
+  data.tar.gz: 013fe557fbbe9ebdcbc0a8dd1d5920a3fd89d312cca5f140936ec35fe97a989e57f96e96d92e3cf157278c2d4b92dea4c7cc855ec8cc9fc31d7a363767a40736

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+build

data/README.md

@@ -76,6 +76,24 @@ Juxtapose comes with a small webapp that you can use to view your screenshot spe
 
 To start it, run `bundle exec juxtapose` in the root of your project and browse to localhost:4567.
 
+## Release Notes
+
+#### v.0.1.1
+
+* Raise error if screenshot sizes don't match ([@mdenomy](http://github.com/mdenomy))
+* Bug fix: Differentiate image status by filename, not full path. Fixes #8.
+
+#### v.0.1.0
+
+* Initial release.
+
+## Contributors
+
+* [Joe Lind](http://github.com/joelind)
+* [Thomas Mayfield](http://github.com/thegreatape )
+* [Jeffrey Chupp](http://github.com/semanticart)
+* [Michael Denomy](http://github.com/mdenomy)
+
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,13 @@
+# -*- coding: utf-8 -*-
+$:.unshift('/Library/RubyMotion/lib')
+require 'motion/project/template/ios'
 require "bundler/gem_tasks"
+Bundler.setup
+Bundler.require
+
+require 'motion-juxtapose'
+
+Motion::Project::App.setup do |app|
+  app.name = 'juxtapose-tests'
+  app.detect_dependencies = false
+end

data/app/app_delegate.rb

@@ -0,0 +1,8 @@
+class AppDelegate
+  def application(application, didFinishLaunchingWithOptions:launchOptions)
+    @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    @window.rootViewController = TestController.alloc.init
+    @window.makeKeyAndVisible
+    true
+  end
+end

data/app/controllers/test_controller.rb

@@ -0,0 +1,14 @@
+class TestController < UIViewController
+  def viewDidLoad
+    super
+    self.view.backgroundColor = UIColor.whiteColor
+    @label = UILabel.alloc.initWithFrame(CGRectZero)
+    @label.text = "Juxtapose"
+    @label.sizeToFit
+
+    @label.center =
+      [self.view.frame.size.width / 2,
+       self.view.frame.size.height / 2]
+      self.view.addSubview(@label)
+  end
+end

data/lib/juxtapose/application/lib/image.rb

@@ -7,7 +7,15 @@ class Image
   end
 
   def accepted?
-    img.match /accepted/
+    File.basename(img).match /accepted/
+  end
+
+  def current?
+    File.basename(img).match /current/
+  end
+
+  def diff?
+    File.basename(img).match /diff/
   end
 
   def path

data/lib/juxtapose/application/lib/spec.rb

@@ -21,15 +21,15 @@ class Spec
   end
 
   def accepted
-    images.select {|i| i.path =~ /accepted/ }.first
+    images.select(&:accepted?).first
   end
 
   def current
-    images.select {|i| i.path =~ /current/ }.first
+    images.select(&:current?).first
   end
 
   def diff
-    images.select {|i| i.path =~ /diff/ }.first
+    images.select(&:diff?).first
   end
 
   def as_json

data/lib/juxtapose/application/spec/models/spec_spec.rb

@@ -23,6 +23,17 @@ describe Spec do
     ]
   end
 
+  it "only uses the file name to determine accepted/current/diff status" do
+    spec_dir ="#{@specs_dir}/ios7.0/currently_logged_in_user"
+    FileUtils.mkdir_p(spec_dir)
+
+    FileUtils.touch("#{spec_dir}/accepted.png")
+
+    spec = Spec.new @specs_dir, spec_dir
+    expect(spec.current).to be_nil
+    expect(spec.accepted.img).to eq("#{spec_dir}/accepted.png")
+  end
+
   it "serializes to JSON" do
     spec_dir ="#{@specs_dir}/ios7.0/user_views_home_screen"
     FileUtils.mkdir_p(spec_dir)

data/lib/juxtapose/screenshotter.rb

@@ -95,22 +95,38 @@ module Juxtapose
 
       success = true
       if File.exists? filename(:accepted )
-        compare_command = "compare -fuzz #{fuzz_factor}% -metric AE -dissimilarity-threshold 1 -subimage-search"
-        out = `#{compare_command} \"#{filename :current}\" \"#{filename :accepted}\" \"#{filename :diff}\" 2>&1`
-        out.chomp!
-        (out == '0').tap do |verified|
-          if verified
-            `rm #{filename(:current)}`
-            `rm #{filename(:diff)}`
-          else
-            success = false
-          end
-        end
+        raise "Screenshots are different sizes" unless same_size?
+        success = screenshots_match?
       else
         raise "No accepted screen shot for #{filename :accepted}"
       end
 
       success
     end
+
+    private
+
+    def same_size?
+      identify_command = "identify -format '%wx%h '"
+      out = `#{identify_command} \"#{filename :current}\" \"#{filename :accepted}\" 2>&1`
+      sizes = out.split
+      sizes.length == 2 && sizes.uniq.length == 1
+    end
+
+    def screenshots_match?
+      match = true
+      compare_command = "compare -fuzz #{fuzz_factor}% -metric AE -dissimilarity-threshold 1 -subimage-search"
+      out = `#{compare_command} \"#{filename :current}\" \"#{filename :accepted}\" \"#{filename :diff}\" 2>&1`
+      out.chomp!
+      (out == '0').tap do |verified|
+        if verified
+          `rm #{filename(:current)}`
+          `rm #{filename(:diff)}`
+        else
+          match = false
+        end
+      end
+      match
+    end
   end
 end

data/lib/juxtapose/version.rb

@@ -1,3 +1,3 @@
 module Juxtapose
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/controllers/test_controller_spec.rb

@@ -0,0 +1,53 @@
+describe 'screenshot testing under bacon' do
+  extend Juxtapose
+
+  tests TestController
+
+  it "raises an error when no accepted screenshot is present" do
+    error = nil
+    begin
+      it_should_look_like "no accepted screenshot"
+    rescue RuntimeError => e
+      error = e
+    end
+    error.should.not.be.nil
+    error.message.should =~ /No accepted screen shot for/
+  end
+
+  it "passes when there is an identical accepted screenshot" do
+    it_should_look_like "accepted screenshot"
+  end
+
+  it "raises an error and produces diffs on failure" do
+    Dispatch::Queue.main.async do
+      view("Juxtapose").text = "Changed!"
+    end
+
+    wait 1.0 do
+      error = nil
+      begin
+        it_should_look_like "going to differ screenshot"
+      rescue RuntimeError => e
+        error = e
+      end
+      error.should.not.be.nil
+      error.message.should =~ /Screenshot did not match/
+
+      spec_dir = "spec/screens/iphone-retina/ios_7.0.3/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot"
+
+      File.should.exist(File.join( ENV["RUBYMOTION_PROJECT_DIR"], spec_dir, "current.png"))
+      File.should.exist(File.join( ENV["RUBYMOTION_PROJECT_DIR"], spec_dir, "diff.png"))
+    end
+  end
+
+  it "raises an error when screens are different sizes" do 
+    error = nil
+    begin
+      it_should_look_like "different sized screenshot"
+    rescue RuntimeError => e
+      error = e
+    end
+    error.should.not.be.nil
+    error.message.should =~ /Screenshots are different sizes/
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-juxtapose
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joe Lind
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -109,6 +109,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/app_delegate.rb
+- app/controllers/test_controller.rb
 - bin/juxtapose
 - images/diff-view.png
 - images/initial-view.png
@@ -155,6 +157,10 @@ files:
 - lib/juxtapose/version.rb
 - lib/motion-juxtapose.rb
 - motion-juxtapose.gemspec
+- spec/controllers/test_controller_spec.rb
+- spec/screens/iphone-retina/ios_7.0.3/screenshot-testing-under-bacon-passes-when-there-is-an-identical-accepted-screenshot/accepted-screenshot/accepted.png
+- spec/screens/iphone-retina/ios_7.0.3/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot/accepted.png
+- spec/screens/iphone-retina/ios_7.0.3/screenshot-testing-under-bacon-raises-an-error-when-screens-are-different-sizes/different-sized-screenshot/accepted.png
 homepage: https://github.com/terriblelabs/motion-juxtapose
 licenses:
 - MIT
@@ -175,8 +181,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Screenshot-based assertions for RubyMotion projects
-test_files: []
+test_files:
+- spec/controllers/test_controller_spec.rb
+- spec/screens/iphone-retina/ios_7.0.3/screenshot-testing-under-bacon-passes-when-there-is-an-identical-accepted-screenshot/accepted-screenshot/accepted.png
+- spec/screens/iphone-retina/ios_7.0.3/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot/accepted.png
+- spec/screens/iphone-retina/ios_7.0.3/screenshot-testing-under-bacon-raises-an-error-when-screens-are-different-sizes/different-sized-screenshot/accepted.png