compatriot 0.1.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afbb7d347ac7f62d9d76171d015598375dacc3ea
-  data.tar.gz: 4ed581e50ef32ee9bfb09600548a4cb68569f04e
+  metadata.gz: cca323e412f69789efb783d7b5fdea2aba03529e
+  data.tar.gz: e526df240f719b44c9f82c25a0b8fe38d621750e
 SHA512:
-  metadata.gz: 6892b84bcd419b50f9b44e599a5f7507e344b000c73d17a2ffeafc3d12a345e21d9eb4c3c2b417f5d7aefd5f60870e7789e5a20fc9a103bb020c75596261f130
-  data.tar.gz: 7ce449cbfb6c95b6ba3a1286dcf362c81291924b42b39bbd9897440dcde59a346cb48913dbef8ede55b8c612c99e16172042a0fa31a55dddaed34357e9e3541c
+  metadata.gz: 4921fc720a06dd3a686999a8ac282691087f001eb5d2927d93e77ee0e476eaa35b4a5bff370a91a714d06753b574218f23be31c4a9edb5a011e3dd0cca64149d
+  data.tar.gz: 49f95b9f7a9760fcf6c7d29480468167e9f34610f956ad0b3bb4a09a2cef40160c89b1a2977919e2f82b42326f13a5a5856e3fc9a10075924e9455128392088a

data/.travis.yml

@@ -1,10 +1,3 @@
-before_script:
-  - "mkdir -p /tmp/bin"
-  - "cd /tmp/bin && wget http://chromium.googlecode.com/files/chromedriver_linux32_16.0.902.0.zip && unzip chromedriver_linux32_16.0.902.0.zip && cd -"
-  - "export PATH=/tmp/bin:$PATH "
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
 script: "bundle exec rake test"
 rvm:
   - 2.1.7

data/README.md

@@ -1,6 +1,6 @@
 Compatriot
 ==========
-[![Build Status](https://secure.travis-ci.org/carols10cents/compatriot.png?branch=master)](http://travis-ci.org/carols10cents/compatriot)
+[![Build Status](https://secure.travis-ci.org/compatriot/compatriot.png?branch=master)](http://travis-ci.org/compatriot/compatriot)
 
 **Compat**ibility + **riot**! It's the **friend** that helps with browser compatibility!
 This Ruby gem makes cross-browser testing less painful.
@@ -12,8 +12,7 @@ Don't let your users find the inconsistencies and get to them first.
 What it does now
 ----------------
 
-* [Documentation on RelishApp](https://www.relishapp.com/clnclarinet/compatriot)
-* Adds a `assert_no_ui_changes` method to your tests
+* Adds a `assert_no_ui_changes` method to your test assertions
 * When called from your tests, it takes a screenshot and compares it to a control image to get percentage difference
 * If the difference is greater then the threshold, it fails the tests
 * Pairs well with [BrowserStacks automation feature](browserstack.com/automate) to run across many environments
@@ -21,14 +20,10 @@ What it does now
 What it will do in the future
 -----------------------------
 
-* Have more documentation (a start is [on RelishApp](https://www.relishapp.com/clnclarinet/compatriot)!)
 * Have a screenshot of sample results in the README
 * Have more and better tests
-* Find the largest, darkest contiguous region in the image diff and have a threshold of pass/fail based on that
 * Perform better on the image processing (by sampling/resizing, using oily_png, etc)
-* Automatically compare the screenshots across browsers and flags those that are more than some configurable threshold different
-* Steal some of VCR's relish rake tasks
-
+* Show a better image difference
 
 How To Use
 ----------
@@ -68,15 +63,25 @@ How To Use
     ```ruby
     it 'does not break the ui' do
       visit some_page_path
-      assert_no_ui_changes('some page')
+      assert_no_ui_changes
     end
     ```
 
 The first time through it will create the control image in `#{screenshot_directory}/control`. You should then review the screenshots and check them into source control as your baseline.
-Every run after that, it will take a variable image screenshot in `#{screenshot_directory}/variable` and a difference image in `#{screenshot_directory}/diffs`.
+Every run after that, it will take a variable image screenshot in `#{screenshot_directory}/variable` and generate a difference image in `#{screenshot_directory}/diffs`.
 
 `assert_no_ui_changes` takes an optional string parameter to allow you to make multiple assertions in a test and not run into name conflicts.
 
+example:
+```ruby
+it 'has multiple ui change assertions' do
+  visit page_1
+  assert_no_ui_changes 'page 1'
+  visit page_2
+  assert_no_ui_changes 'page 2'
+end
+```
+
 To see the % difference for every assertion, and get the path the the difference, set `config.show_diffs = true` when you configure Compatriot.
 
 
@@ -86,6 +91,7 @@ How to run this against multiple environments?
 The intentions for running this against multiple environments is that you would run your test suite once for every environment you wish to run it against.
 To accomplish this, you should set your `screenshot_directory` to include the current environment name, this way you will store your control images in separate directories.
 
+*Note: The configuration example above shows you how to set the directory using the specified capabilities.*
 
 What to do to run its tests
 ---------------------------
@@ -105,7 +111,7 @@ How You Can Contribute
 
 We'd really like to know if something is wrong, so please file an issue on the Issue List if you have a problem, suggestion, unsupported use case, etc.
 
-This is a very rough proof-of-concept at this point, so there are many opportunities for improvement. Feel free to:
+There are many opportunities for improvement. Feel free to:
 
 * **Fork** the repository
 * **Clone the repository** locally, or **edit via Github**
@@ -126,9 +132,6 @@ Many thanks to the wonderful libraries that make this gem possible:
 * [selenium-webdriver](http://seleniumhq.org/docs/01_introducing_selenium.html#selenium-2-aka-selenium-webdriver)
 * [chunky_png](https://github.com/wvanbergen/chunky_png) (and especially [this blog post about using chunky_png to create image diffs](http://jeffkreeftmeijer.com/2011/comparing-images-and-creating-image-diffs/?utm_source=rubyweekly&utm_medium=email) by Jeff Kreeftmeijer)
 * [travis](http://travis-ci.org/) for CI
-* [relishapp](https://www.relishapp.com/) for documentation
-* [vcr](https://github.com/myronmarston/vcr) for having such awesome documentation that it inspired me to use Relishapp
-
 
 Contributors
 ------------

data/compatriot.gemspec

@@ -21,13 +21,12 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'minitest', '~> 5.8', '>= 5.8.2'
   gem.add_development_dependency 'minitest-reporters', '~> 1.1', '>= 1.1.8'
-  gem.add_development_dependency 'sinatra', '~> 1.4', '>= 1.4.6'
   gem.add_development_dependency 'mocha', '~> 1.1', '>= 1.1.0'
   gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'
+  gem.add_development_dependency 'rack', '~> 1.6', '>= 1.6.5'
 
   gem.add_runtime_dependency 'capybara', '~> 2.5', '>= 2.5.0'
-  gem.add_runtime_dependency 'selenium-webdriver', '~> 2.48', '>= 2.48.1'
-  gem.add_runtime_dependency 'rake', '~> 10.4', '>= 10.4.2'
   gem.add_runtime_dependency 'chunky_png', '~> 1.3', '>= 1.3.5'
   gem.add_runtime_dependency 'oily_png', '~> 1.2.0'
   gem.add_runtime_dependency 'haml', '~> 4.0.7'

data/lib/compatriot.rb

@@ -1,10 +1,8 @@
 require "compatriot/assertions"
 require "compatriot/version"
-require "compatriot/runner"
-require "compatriot/browser"
-require "compatriot/results_presenter"
 require "compatriot/image_differ/image_differ"
 require "compatriot/minitest_report_driver"
+require "capybara"
 
 module Compatriot
   class << self
@@ -16,10 +14,6 @@ module Compatriot
       yield self
     end
 
-    def run(paths)
-      Compatriot::Runner.start(app, paths)
-    end
-
     def take_screenshot(test, description)
       filename = filename_for_test(test, description)
       control_image_path = filepath_for_screenshot('control', filename)

data/lib/compatriot/version.rb

@@ -1,3 +1,3 @@
 module Compatriot
-  VERSION = "0.1.9"
+  VERSION = "1.0.0"
 end

data/spec/spec_helper.rb

@@ -6,23 +6,8 @@ require "mocha/mini_test"
 
 require 'compatriot'
 
-require_relative "sample_app/sample_app"
-
 SCREENSHOTS_DIR      = './tmp/test/screenshots'
 
-# A custom runner to enable before_suite and after_suite setup/teardown.
-# http://bfts.rubyforge.org/minitest/index.html
-# Only using it to delete the screenshots that result from running the tests
-# before running the suite; it's useful to be able to look at the screenshots
-# after a test run so we're not deleting them then.
-
-module TestRunner
-  def before_setup
-    super
-    FileUtils.remove_dir(File.join("sample_app", "tmp", "results"), true)
-  end
-end
-
 module FakeCapybara
   def self.current_session
     Page.new
@@ -42,7 +27,6 @@ class Page
 end
 
 class Minitest::Spec
-  include TestRunner
   include Compatriot::Assertions
   Compatriot.configure do |config|
     config.screenshot_directory = SCREENSHOTS_DIR

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compatriot
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Carol (Nichols || Goulding)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -51,26 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.8
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -106,65 +86,65 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :runtime
+        version: 10.4.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.48'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.48.1
-  type: :runtime
+        version: 1.6.5
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.48'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.48.1
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '2.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '2.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -232,30 +212,22 @@ files:
 - Rakefile
 - bin/colordiff
 - compatriot.gemspec
-- examples/compatriot_tests.rb
 - lib/compatriot.rb
 - lib/compatriot/assertions.rb
-- lib/compatriot/browser.rb
 - lib/compatriot/image_differ/color_differ.rb
 - lib/compatriot/image_differ/image_differ.rb
 - lib/compatriot/minitest_report_driver.rb
 - lib/compatriot/report_template.html.haml
 - lib/compatriot/reporter.rb
-- lib/compatriot/results_presenter.rb
-- lib/compatriot/runner.rb
 - lib/compatriot/version.rb
 - spec/images/1.png
 - spec/images/2.png
-- spec/sample_app/public/images/smileyface.jpg
-- spec/sample_app/sample_app.rb
 - spec/spec_helper.rb
 - spec/unit/assertions_spec.rb
-- spec/unit/browser_spec.rb
 - spec/unit/compatriot_spec.rb
 - spec/unit/image_differ/color_differ_spec.rb
 - spec/unit/image_differ/image_differ_spec.rb
 - spec/unit/report_spec.rb
-- spec/unit/runner_spec.rb
 homepage: https://github.com/carols10cents/compatriot
 licenses:
 - MIT
@@ -285,13 +257,9 @@ summary: Add assertions that screenshots taken during your tests do not differ f
 test_files:
 - spec/images/1.png
 - spec/images/2.png
-- spec/sample_app/public/images/smileyface.jpg
-- spec/sample_app/sample_app.rb
 - spec/spec_helper.rb
 - spec/unit/assertions_spec.rb
-- spec/unit/browser_spec.rb
 - spec/unit/compatriot_spec.rb
 - spec/unit/image_differ/color_differ_spec.rb
 - spec/unit/image_differ/image_differ_spec.rb
 - spec/unit/report_spec.rb
-- spec/unit/runner_spec.rb

data/examples/compatriot_tests.rb

@@ -1,9 +0,0 @@
-require 'compatriot'
-require_relative "../spec/sample_app/sample_app"
-
-Compatriot.app = SampleApp
-
-Compatriot.run(%w[
-  /
-  /chrome-css-bug
-])

data/lib/compatriot/browser.rb

@@ -1,82 +0,0 @@
-require "fileutils"
-require 'capybara/dsl'
-
-module Compatriot
-  class Browser
-    include Capybara::DSL
-
-    def self.create_browsers(params = {})
-      params[:browser_names].collect do |b|
-        Compatriot::Browser.new(
-          :name => b,
-          :screenshot_directory => params[:results_directory]
-        )
-      end
-    end
-
-    attr_reader :name
-
-    def initialize(params = {})
-      @name                 = params[:name]
-      @screenshot_directory = params[:screenshot_directory]
-      @screenshot_locations = {}
-
-      create_screenshot_path
-    end
-
-    def screenshot_path
-      File.join(@screenshot_directory, @name)
-    end
-
-    def initialize_capybara(app)
-      driver = "selenium_#{@name}".to_sym
-      Capybara.register_driver driver do |a|
-        Capybara::Selenium::Driver.new(a, :browser => @name.to_sym)
-      end
-      Capybara.default_driver = driver
-      Capybara.app = app
-    end
-
-    def take_screenshots(params = {})
-      initialize_capybara(params[:app])
-      params[:paths].map { |path| take_screenshot(path) }
-
-      # Reset the selenium session to avoid timeout errors
-      Capybara.send(:session_pool).delete_if { |key, value| key =~ /selenium/i }
-    end
-
-    def absolute_screenshot_for(path)
-      if @screenshot_locations[path]
-        absolute_dir(@screenshot_locations[path])
-      end
-    end
-
-    def relative_screenshot_for(path)
-      if @screenshot_locations[path]
-        File.join(name, @screenshot_locations[path])
-      end
-    end
-
-    def take_screenshot(path)
-      visit path
-      filename = next_filename
-      Capybara.page.driver.browser.save_screenshot(absolute_dir(filename))
-      @screenshot_locations[path] = filename
-    end
-
-    private
-
-    def absolute_dir(filename)
-      File.join(screenshot_path, filename)
-    end
-
-    def next_filename
-      @file_id = (@file_id && @file_id + 1) || 1
-      "#{@file_id}.png"
-    end
-
-    def create_screenshot_path
-      FileUtils.mkdir_p(screenshot_path)
-    end
-  end
-end

data/lib/compatriot/results_presenter.rb

@@ -1,63 +0,0 @@
-require 'erb'
-
-module Compatriot
-  class ResultsPresenter
-    def initialize(results_directory)
-      @results_directory = results_directory
-    end
-
-    def make_index_page(params = {})
-      index_page_file = File.join(@results_directory, "index.html")
-
-      b        = binding
-      paths    = params[:paths]
-      browsers = params[:browsers]
-      differ   = params[:differ]
-
-      html = ERB.new <<-EOF
-        <html>
-          <head>
-            <title>Cross browser test results</title>
-            <style type='text/css'>
-              table, tr, th, td {
-                border: 1px solid #aaa;
-              }
-              img {
-                width: 300px;
-              }
-            </style>
-          </head>
-          <body>
-            <h1>Results</h1>
-            <table>
-              <tr>
-                <th>Path</th>
-                <% browsers.each do |browser| %>
-                  <th><%= browser.name %></th>
-                <% end %>
-                <th>Diff</th>
-              </tr>
-              <% paths.each do |path| %>
-                <tr>
-                  <td>
-                    <%= path %>
-                  </td>
-                  <% browsers.each do |browser| %>
-                    <td>
-                      <img src="<%= browser.relative_screenshot_for(path) %>" />
-                    </td>
-                  <% end %>
-                  <td>
-                    <img src="<%= differ.diff_for(path) %>" />
-                  </td>
-                </tr>
-              <% end %>
-            </table>
-          </body>
-        </html>
-      EOF
-
-      File.open(index_page_file, 'w') {|f| f.write(html.result(b)) }
-    end
-  end
-end

data/lib/compatriot/runner.rb

@@ -1,65 +0,0 @@
-require 'fileutils'
-require 'date'
-
-module Compatriot
-  class Runner
-    def self.start(app, paths, clock = DateTime)
-      runner = new(app, paths, clock)
-      runner.create_results_directory
-      runner.take_screenshots
-      runner.compute_diffs
-      runner.make_index_page
-      runner
-    end
-
-    BROWSERS = ["firefox", "chrome"]
-
-    attr_reader :app, :results_directory
-
-    def initialize(app, paths, clock)
-      @app   = app
-      @paths = paths
-      @clock = clock
-
-      timestamp = @clock.now.strftime("%Y-%m-%d-%H-%M-%S")
-      @results_directory = File.join("tmp", "results", timestamp)
-
-      @browsers = Compatriot::Browser.create_browsers(
-        :browser_names     => BROWSERS,
-        :results_directory => @results_directory
-      )
-    end
-
-    def take_screenshots
-      @browsers.each do |browser_object|
-        browser_object.take_screenshots(
-          :app   => @app,
-          :paths => @paths
-        )
-      end
-    end
-
-    def compute_diffs
-      @differ = Compatriot::ImageDiffer.new(
-        :paths    => @paths,
-        :browsers => @browsers,
-        :strategy => Compatriot::ColorDiffer,
-        :results_directory => @results_directory
-      )
-      @differ.compute!
-    end
-
-    def make_index_page
-      presenter = Compatriot::ResultsPresenter.new(@results_directory)
-      presenter.make_index_page(
-        :paths    => @paths,
-        :browsers => @browsers,
-        :differ   => @differ
-      )
-    end
-
-    def create_results_directory
-      FileUtils.mkdir_p(@results_directory)
-    end
-  end
-end

data/spec/sample_app/sample_app.rb

@@ -1,21 +0,0 @@
-require 'sinatra/base'
-require 'rack'
-require 'yaml'
-
-class SampleApp < Sinatra::Base
-  set :root, File.dirname(__FILE__)
-  set :static, true
-
-  get '/' do
-    "<h1>Hello world!</h1><div><a href='chrome-css-bug'>Try another page</a></div>"
-  end
-
-  get "/chrome-css-bug" do
-    "<table><tr style='background: url(/images/smileyface.jpg) no-repeat;'><td style='padding:30px;'>One</td><td style='padding:30px;'>Two</td></tr></table>"
-  end
-
-end
-
-if __FILE__ == $0
-  Rack::Handler::WEBrick.run SampleApp, :Port => 8070
-end

data/spec/unit/browser_spec.rb

@@ -1,171 +0,0 @@
-require_relative '../spec_helper'
-
-describe Compatriot::Browser do
-  describe "self#create_browsers" do
-    it "creates a browser object for each browser name given to it" do
-      browsers = ["linx", "dolphin HD"] # Selenium totally doesn't work w/these
-      fake_directory = "/some/location"
-
-      linx = stub
-      dolphin = stub
-
-      Compatriot::Browser.expects(:new).with(
-        :name => "linx",
-        :screenshot_directory => fake_directory
-      ).returns(linx)
-
-      Compatriot::Browser.expects(:new).with(
-        :name => "dolphin HD",
-        :screenshot_directory => fake_directory
-      ).returns(dolphin)
-
-      results = Compatriot::Browser.create_browsers(
-        :browser_names => browsers,
-        :results_directory => fake_directory
-      )
-      results.must_equal([linx, dolphin])
-    end
-  end
-
-  describe "initialize_capybara" do
-    before do
-      Compatriot::Browser.any_instance.stubs(:create_screenshot_path)
-      @b = Compatriot::Browser.new(
-        :name => "foo",
-        :screenshot_directory => "bar"
-      )
-    end
-
-    it "registers a new driver" do
-      Capybara.expects(:register_driver).with(:selenium_foo)
-
-      @b.initialize_capybara(stub)
-    end
-
-    it "sets this driver as the default" do
-      Capybara.expects(:default_driver=).with(:selenium_foo)
-
-      @b.initialize_capybara(stub)
-    end
-
-    it "sets the Capybara app" do
-      app = stub
-      Capybara.expects(:app=).with(app)
-
-      @b.initialize_capybara(app)
-    end
-  end
-
-  describe "take_screenshots" do
-    before do
-      Compatriot::Browser.any_instance.stubs(:create_screenshot_path)
-      @b = Compatriot::Browser.new(
-        :name => "foo",
-        :screenshot_directory => "bar"
-      )
-    end
-
-    it "calls initialize_capybara once and take_screenshot for each path" do
-      app = stub
-      @b.expects(:initialize_capybara).with(app)
-
-      @b.expects(:take_screenshot).with("/")
-      @b.expects(:take_screenshot).with("/contact")
-
-      @b.take_screenshots(
-        :app => app,
-        :paths => ["/", "/contact"]
-      )
-    end
-  end
-
-  describe "take_screenshot" do
-    before do
-      Compatriot::Browser.any_instance.stubs(:create_screenshot_path)
-      @b = Compatriot::Browser.new(
-        :name => "foo",
-        :screenshot_directory => "bar"
-      )
-      app = stub
-      @b.initialize_capybara(app)
-    end
-
-    it "visits the path" do
-      @b.expects(:visit).with("/some_page")
-
-      capybara_browser = stub
-      capybara_browser.stubs(:save_screenshot)
-      Capybara.page.driver.stubs(:browser).returns(capybara_browser)
-
-      @b.take_screenshot("/some_page")
-    end
-
-    it "tells capybara to take a screenshot" do
-      @b.stubs(:visit)
-
-      @b.stubs(:next_filename).returns("/where_to_save")
-      capybara_browser = stub
-      capybara_browser.expects(:save_screenshot).with("bar/foo/where_to_save")
-      Capybara.page.driver.stubs(:browser).returns(capybara_browser)
-
-      @b.take_screenshot("/some_page")
-    end
-
-    it "increments the filenames" do
-      @b.stubs(:visit)
-
-      capybara_browser = stub
-      capybara_browser.stubs(:save_screenshot)
-      Capybara.page.driver.stubs(:browser).returns(capybara_browser)
-
-      @b.take_screenshot("/some_page")
-      @b.take_screenshot("/some_other_page")
-
-      @b.relative_screenshot_for("/some_page").must_equal("foo/1.png")
-      @b.relative_screenshot_for("/some_other_page").must_equal("foo/2.png")
-    end
-
-  end
-
-  describe "relative_screenshot_for" do
-    before do
-      Compatriot::Browser.any_instance.stubs(:create_screenshot_path)
-      @b = Compatriot::Browser.new(
-        :name => "foo",
-        :screenshot_directory => "bar"
-      )
-      app = stub
-      @b.initialize_capybara(app)
-    end
-
-    it "returns nil if there is no screenshot for that path" do
-      @b.relative_screenshot_for("/whatever").must_equal(nil)
-    end
-
-    it "stores the screenshot location by path" do
-      @b.stubs(:visit)
-      @b.stubs(:next_filename).returns("/some/location.png")
-
-      capybara_browser = stub
-      capybara_browser.stubs(:save_screenshot)
-      Capybara.page.driver.stubs(:browser).returns(capybara_browser)
-
-      @b.take_screenshot("/")
-
-      @b.relative_screenshot_for("/").must_equal("foo/some/location.png")
-    end
-  end
-
-  describe "screenshot_path" do
-    it "adds the browser name to the screenshot dir and creates it" do
-      FileUtils.expects(:mkdir_p).with("foo/bar/hi")
-
-      c = Compatriot::Browser.new(
-        :name => "hi",
-        :screenshot_directory => "foo/bar"
-      )
-
-      c.screenshot_path.must_equal("foo/bar/hi")
-    end
-  end
-end

data/spec/unit/runner_spec.rb

@@ -1,64 +0,0 @@
-require_relative '../spec_helper'
-
-describe Compatriot::Runner do
-  before do
-    Compatriot::Runner.any_instance.stubs(:create_results_directory)
-    Compatriot::Browser.any_instance.stubs(:create_screenshot_path)
-    fake_date      = DateTime.parse("2012-01-01 00:00:00 UTC")
-    @fake_date_dir = fake_date.strftime("%Y-%m-%d-%H-%M-%S")
-    @fixed_clock   = OpenStruct.new(:now => fake_date)
-    @results_dir_name = File.join("tmp", "results", @fake_date_dir)
-  end
-
-  describe "self#start" do
-    it "creates a Runner instance and calls the other methods on it" do
-      runner = stub
-
-      Compatriot::Runner.expects(:new).returns(runner)
-      runner.expects(:create_results_directory)
-      runner.expects(:take_screenshots)
-      runner.expects(:compute_diffs)
-      runner.expects(:make_index_page)
-
-      Compatriot::Runner.start(stub, stub)
-    end
-  end
-
-  describe "#take_screenshots" do
-    it "calls take_screenshots for each browser" do
-      firefox_browser = stub
-      chrome_browser  = stub
-
-      Compatriot::Browser.expects(:create_browsers).returns([
-        firefox_browser,
-        chrome_browser
-      ])
-
-      app   = stub
-      paths = stub
-
-      firefox_browser.expects(:take_screenshots).with(
-        :app   => app,
-        :paths => paths
-      )
-      chrome_browser.expects(:take_screenshots).with(
-        :app   => app,
-        :paths => paths
-      )
-
-      runner = Compatriot::Runner.new(app, paths, @fixed_clock)
-
-      runner.take_screenshots
-    end
-  end
-
-
-  describe "#results_directory" do
-    it "names a results directory in tmp/results based on the clock" do
-      runner = Compatriot::Runner.new(SampleApp, ["/"], @fixed_clock)
-
-      runner.results_directory.must_equal(@results_dir_name)
-    end
-  end
-
-end