motion-juxtapose 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a58dcf720096d73d57d3a904dee1bc216889ce5c
-  data.tar.gz: b54b20541785bfbcb8873f552021578e034ea12e
+  metadata.gz: d2ccac7f22e4efec4bbf3c70e6beea4764eb4539
+  data.tar.gz: 3eb7f65dd5b4585f891a97f7eac80892fbc5d828
 SHA512:
-  metadata.gz: 78e454b932c47f2f76cc27ba28e97c2016fe921f1b3febc6b05164236dd95af2ce5fc542b3a7198af7d3c96be7087e81be1e343b90118c79a83e619d9a6dd2b1
-  data.tar.gz: f2253d30b74513c06b7393734f7155be1c45c482d036328203e5d657d3a3a961596863d8b71a70f2446e703b04a0c5aa15ab5ee1ac2c27b106966daa32fe1347
+  metadata.gz: ed97658f49980bbeb7aad17b81d63d6c6be702aff3e6a5651c9eb97dd0130b2e815b33c8b5542c9016f15af2addef85b7175716f306991efaa6d5bbba666acf1
+  data.tar.gz: d667feadb1158ce8dc85be01d79569fb96ef690bf77d19337aa39e0dfdfa806c6193aa30792ef69550cd6672cf9df5dcc96662f19ef61ff02e2d009ade0f4a32

data/LaunchScreen.xib

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Juxtapose" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                    <rect key="frame" x="20" y="140" width="441" height="43"/>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
+                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="548" y="455"/>
+        </view>
+    </objects>
+</document>

data/README.md

@@ -76,6 +76,28 @@ Then /^the screen should match "([^\"]*)"$/ do |template|
 end
 ```
 
+### Appium
+
+Add the following config to your features/support/env.rb:
+
+```ruby
+require 'motion-juxtapose'
+Juxtapose::AppiumStrategy.setup
+```
+
+This lets you write a screenshot matcher along the lines of:
+
+```ruby
+Then /^the screen should match "([^\"]*)"$/ do |template|
+  wait_for_nothing_to_be_animating
+  #unlike frank we need to pass in a project root to find the screenshot directory
+  screenshotter = Juxtapose::Screenshotter.new(self, template, 0, File.expand_path('./'))
+
+  max_attempts = 20
+  expect(screenshotter.attempt_verify(max_attempts)).to eq(true)
+end
+```
+
 ## Testing Rails Apps
 
 ### Capybara
@@ -131,6 +153,10 @@ To start it, run `bundle exec juxtapose` in the root of your project and browse
 
 ## Release Notes
 
+#### v.0.3.0
+* Add Appium support ([@squidpunch](http://github.com/squidpunch))
+* Add support for 6/6+ screen sizes ([@squidpunch](http://github.com/squidpunch))
+
 #### v.0.2.0
 * Rails/rspec support
 * Fixes to work under newest version of ImageMagick
@@ -150,6 +176,7 @@ To start it, run `bundle exec juxtapose` in the root of your project and browse
 * [Thomas Mayfield](http://github.com/thegreatape )
 * [Jeffrey Chupp](http://github.com/semanticart)
 * [Michael Denomy](http://github.com/mdenomy)
+* [David Larrabee](http://github.com/squidpunch)
 
 
 ## Contributing

data/Rakefile

@@ -10,4 +10,5 @@ require 'motion-juxtapose'
 Motion::Project::App.setup do |app|
   app.name = 'juxtapose-tests'
   app.detect_dependencies = false
+  app.info_plist["UILaunchStoryboardName"] = "LaunchScreen"
 end

data/lib/juxtapose/image_matcher.rb

@@ -0,0 +1,21 @@
+class ImageMatcher
+  attr_reader :fuzz_factor, :diff_file_name
+  def initialize(options={})
+    @fuzz_factor = options.fetch(:fuzz_factor, 0)
+    @diff_file_name = options.fetch(:diff_file_name, './temp.png')
+  end
+
+  def identical?(source, target)
+    compare_command = "compare -fuzz #{fuzz_factor}% -metric AE -dissimilarity-threshold 1 -subimage-search"
+    out = `#{compare_command} \"#{source}\" \"#{target}\" \"#{diff_file_name}\" 2>&1`
+    out.chomp!
+    out.start_with?('0')
+  end
+
+  def cleanup
+    if File.exist?(diff_file_name)
+      `rm #{diff_file_name}`
+    end
+  end
+end
+

data/lib/juxtapose/rspec.rb

@@ -1,7 +1,14 @@
 if defined?(RSpec::Matchers)
-  RSpec::Matchers.define :look_like do |predicate|
-    match do |page|
-      page.looks_like?(predicate) == true
+  RSpec::Matchers.define :look_like do |expected, options={}|
+    match do |actual|
+      if actual.respond_to?(:looks_like?)
+        actual.looks_like?(expected) == true
+      else
+        matcher = ImageMatcher.new(options)
+        matcher.identical?(expected, actual).tap do
+          matcher.cleanup
+        end
+      end
     end
   end
 end

data/lib/juxtapose/screenshotter.rb

@@ -35,12 +35,14 @@ module Juxtapose
     attr_reader :strategy
     attr_reader :template
     attr_reader :fuzz_factor
+    attr_accessor :project_root
 
-    def initialize(context, template, fuzz_factor = 0)
+    def initialize(context, template, fuzz_factor = 0, project_root = nil)
       @context = context
       @template = template.gsub(' ', '-')
       @strategy = strategy_for_context(context)
       @fuzz_factor = fuzz_factor
+      @project_root = project_root || default_project_root
     end
 
     def strategy_for_context(context)
@@ -50,10 +52,12 @@ module Juxtapose
         Juxtapose::FrankStrategy.new(context)
       elsif defined?(Capybara)
         Juxtapose::CapybaraStrategy.new(context)
+      elsif defined?(Appium)
+        Juxtapose::AppiumStrategy.new(context)
       end
     end
 
-    def project_root
+    def default_project_root
       if defined? Rails
         Rails.root
       else
@@ -66,13 +70,19 @@ module Juxtapose
     end
 
     def dir
-      @dir ||= File.join(project_root,
-                         strategy.spec_dir,
-                         strategy.device_name,
-                         strategy.version,
-                         test_name,
-                         template).tap do |dir|
-        `mkdir -p #{dir}`
+      @dir ||= begin
+        parts = [
+          project_root,
+          strategy.spec_dir,
+          strategy.device_name,
+          strategy.version,
+          test_name,
+          template
+        ].map {|p| p.to_s.gsub(/ /, '-')}
+
+        File.join(*parts).tap do |dir|
+          `mkdir -p #{dir}`
+        end
       end
     end
 
@@ -125,7 +135,12 @@ module Juxtapose
     end
 
     def imagemagick_installed?
-      `command -v convert`.length > 0
+      if RUBY_PLATFORM =~ /darwin/
+        `command -v convert`
+      else
+        `which convert`
+      end
+      $?.success?
     end
 
     private
@@ -147,10 +162,8 @@ module Juxtapose
     end
 
     def identical_images?
-      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.start_with?('0')
+      matcher = ImageMatcher.new(fuzz_factor: fuzz_factor, diff_file_name: filename(:diff))
+      matcher.identical?(filename(:current), filename(:accepted))
     end
 
     def screenshots_match?

data/lib/juxtapose/strategy/appium_strategy.rb

@@ -0,0 +1,33 @@
+module Juxtapose
+  class AppiumStrategy
+    attr_accessor :context
+    attr_accessor :project_root
+    def self.setup
+      Cucumber::RbSupport::RbDsl.register_rb_hook('before', [], Proc.new {|scenario, block| @__scenario = scenario })
+    end
+
+    def initialize(context)
+      self.context = context
+    end
+
+    def spec_dir
+      "features/screens"
+    end
+
+    def device_name
+      context.driver_attributes[:caps][:deviceName].gsub(" ","-").downcase
+    end
+
+    def version
+      context.driver_attributes[:caps][:platformVersion]
+    end
+
+    def current_spec_description
+      context.instance_variable_get('@__scenario').name
+    end
+
+    def save_current(filename)
+      context.screenshot(filename)
+    end
+  end
+end

data/lib/juxtapose/strategy/mac_bacon_strategy.rb

@@ -16,7 +16,9 @@ module Juxtapose
     def device_name
       name = [UIDevice.currentDevice.model.gsub(/\s+Simulator/, '').downcase]
       name << 'retina' if UIScreen.mainScreen.scale > 1
-      name << '5' if UIScreen.mainScreen.bounds.size.height > 480
+      name << '5' if UIScreen.mainScreen.bounds.size.height == 568.0
+      name << '6' if UIScreen.mainScreen.bounds.size.height == 667.0
+      name << '6-plus' if UIScreen.mainScreen.bounds.size.height == 736.0
       name.join('-')
     end
 

data/lib/juxtapose/version.rb

@@ -1,3 +1,3 @@
 module Juxtapose
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/motion-juxtapose.rb

@@ -1,7 +1,9 @@
 require "juxtapose/version"
+require "juxtapose/image_matcher"
 require "juxtapose/screenshotter"
 require "juxtapose/strategy/frank_strategy"
 require "juxtapose/strategy/capybara_strategy"
+require "juxtapose/strategy/appium_strategy"
 
 if defined?(Motion::Project::Config)
   Motion::Project::App.setup do |app|

data/spec/controllers/test_controller_spec.rb

@@ -33,7 +33,7 @@ describe 'screenshot testing under bacon' do
       error.should.not.be.nil
       error.message.should =~ /Screenshot did not match/
 
-      spec_dir = "spec/screens/iphone-retina/ios_7.1/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot"
+      spec_dir = "spec/screens/iphone-retina-6/ios_8.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"))

data/spec/lib/rspec_matchers_spec.rb

@@ -0,0 +1,18 @@
+if defined?(RSpec)
+  describe "rspec matchers" do
+    require_relative '../../lib/juxtapose/image_matcher'
+    require_relative '../../lib/juxtapose/rspec'
+
+    it "passes true if files are identical" do
+      dog1 = File.join(File.dirname(__FILE__), "../files/dog1.jpg")
+      dog2 = File.join(File.dirname(__FILE__), "../files/dog2.jpg")
+      expect(dog1).to look_like(dog2)
+    end
+
+    it "passes with a fuzzy threshold" do
+      dog1 = File.join(File.dirname(__FILE__), "../files/dog1.jpg")
+      dog2 = File.join(File.dirname(__FILE__), "../files/dog_fuzzy.jpg")
+      expect(dog1).to look_like(dog2, fuzz_factor: 78.0)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-juxtapose
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Joe Lind
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -107,6 +107,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
+- LaunchScreen.xib
 - README.md
 - Rakefile
 - app/app_delegate.rb
@@ -152,8 +153,10 @@ files:
 - lib/juxtapose/application/spec/spec_helper.rb
 - lib/juxtapose/application/views/index.html.haml
 - lib/juxtapose/capybara.rb
+- lib/juxtapose/image_matcher.rb
 - lib/juxtapose/rspec.rb
 - lib/juxtapose/screenshotter.rb
+- lib/juxtapose/strategy/appium_strategy.rb
 - lib/juxtapose/strategy/capybara_strategy.rb
 - lib/juxtapose/strategy/frank_strategy.rb
 - lib/juxtapose/strategy/mac_bacon_strategy.rb
@@ -161,9 +164,20 @@ files:
 - lib/motion-juxtapose.rb
 - motion-juxtapose.gemspec
 - spec/controllers/test_controller_spec.rb
-- spec/screens/iphone-retina/ios_7.1/screenshot-testing-under-bacon-passes-when-there-is-an-identical-accepted-screenshot/accepted-screenshot/accepted.png
-- spec/screens/iphone-retina/ios_7.1/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot/accepted.png
-- spec/screens/iphone-retina/ios_7.1/screenshot-testing-under-bacon-raises-an-error-when-screens-are-different-sizes/different-sized-screenshot/accepted.png
+- spec/files/dog1.jpg
+- spec/files/dog2.jpg
+- spec/files/dog_fuzzy.jpg
+- spec/lib/rspec_matchers_spec.rb
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-passes-when-there-is-an-identical-accepted-screenshot/accepted-screenshot/accepted.png
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot/accepted.png
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot/current.png
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-raises-an-error-when-no-accepted-screenshot-is-present/no-accepted-screenshot/current.png
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-raises-an-error-when-screens-are-different-sizes/different-sized-screenshot/accepted.png
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-raises-an-error-when-screens-are-different-sizes/different-sized-screenshot/current.png
+- spec/screens/iphone-retina/ios_8.3/screenshot-testing-under-bacon-passes-when-there-is-an-identical-accepted-screenshot/accepted-screenshot/current.png
+- spec/screens/iphone-retina/ios_8.3/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot/current.png
+- spec/screens/iphone-retina/ios_8.3/screenshot-testing-under-bacon-raises-an-error-when-no-accepted-screenshot-is-present/no-accepted-screenshot/current.png
+- spec/screens/iphone-retina/ios_8.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
@@ -190,6 +204,17 @@ specification_version: 4
 summary: Screenshot-based assertions for RubyMotion projects
 test_files:
 - spec/controllers/test_controller_spec.rb
-- spec/screens/iphone-retina/ios_7.1/screenshot-testing-under-bacon-passes-when-there-is-an-identical-accepted-screenshot/accepted-screenshot/accepted.png
-- spec/screens/iphone-retina/ios_7.1/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot/accepted.png
-- spec/screens/iphone-retina/ios_7.1/screenshot-testing-under-bacon-raises-an-error-when-screens-are-different-sizes/different-sized-screenshot/accepted.png
+- spec/files/dog1.jpg
+- spec/files/dog2.jpg
+- spec/files/dog_fuzzy.jpg
+- spec/lib/rspec_matchers_spec.rb
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-passes-when-there-is-an-identical-accepted-screenshot/accepted-screenshot/accepted.png
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot/accepted.png
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot/current.png
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-raises-an-error-when-no-accepted-screenshot-is-present/no-accepted-screenshot/current.png
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-raises-an-error-when-screens-are-different-sizes/different-sized-screenshot/accepted.png
+- spec/screens/iphone-retina-6/ios_8.3/screenshot-testing-under-bacon-raises-an-error-when-screens-are-different-sizes/different-sized-screenshot/current.png
+- spec/screens/iphone-retina/ios_8.3/screenshot-testing-under-bacon-passes-when-there-is-an-identical-accepted-screenshot/accepted-screenshot/current.png
+- spec/screens/iphone-retina/ios_8.3/screenshot-testing-under-bacon-raises-an-error-and-produces-diffs-on-failure/going-to-differ-screenshot/current.png
+- spec/screens/iphone-retina/ios_8.3/screenshot-testing-under-bacon-raises-an-error-when-no-accepted-screenshot-is-present/no-accepted-screenshot/current.png
+- spec/screens/iphone-retina/ios_8.3/screenshot-testing-under-bacon-raises-an-error-when-screens-are-different-sizes/different-sized-screenshot/accepted.png