ojo 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fb122efa0d57d0f24c768e2ddd60877062746bf
-  data.tar.gz: 372a6fdbe461d6aa7b519bf4bbd4182a2df03e4f
+  metadata.gz: fc965e4b05eb265b42f3fc22c46f5898222a3fb4
+  data.tar.gz: 19f1b43550134f0982c9dd5030b6702a510d6ee5
 SHA512:
-  metadata.gz: 336ea819a2118e57a750a404a8ed0256aaa8c5c1c3970d7c958be4d3cc065e1e42c3518294472fe92686aaf68046949d277215d8cc772b81393a58fabd337ca0
-  data.tar.gz: b63f2c1b6cbcb0ead4b42404f1411839963d88ab5be0e4cf18d161c02b8a2814813a4e7050782091903010f38c8a8068a134fb5257d07cf2a44986585b5c669c
+  metadata.gz: e5d09e1f5ff347541cb6909029a886f7f55ee840b07514a7ed16e68eac05e12480b3530cb2f72cfe9f206362f347594f967b93f5a337970b8982aa8c067ea1e2
+  data.tar.gz: 0c891cfee69440cdf3f8c8b82badd7029c137aae5875cbbb6d400e89cd11e6a66923cfa61398842c4f0a8d6b7c4e78c5206762769ed00aeb0de7b2024672cfbe

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'ojo'
 
@@ -12,8 +12,16 @@ namespace :test do
     t.pattern = 'test/unit/**/*_test.rb'
     t.verbose = false
   end
+
+  desc 'phantom js'
+  Rake::TestTask.new :phantom do |t|
+    t.libs << '.'
+    t.libs << 'test'
+    t.pattern = 'test/phantom/**/*_test.rb'
+    t.verbose = false
+  end
 end
 
-task :test => [ 'test:units' ]
+task :test => %w(test:units test:phantom)
 
 task :default => :test

data/lib/ojo.rb

@@ -1,4 +1,5 @@
 require 'collimator'
+require 'open4'
 
 require 'ojo/rails/engine' if defined?(Rails)
 require 'ojo/version'

data/lib/ojo/version.rb

@@ -1,3 +1,3 @@
 module Ojo
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/tasks/ojo.rake

@@ -3,8 +3,8 @@ require 'fileutils'
 namespace :ojo do
   desc 'use ojo to compare two branches'
   task :compare, [:branch_1, :branch_2] => :environment do |t, args|
-    branch_1 = args.fetch(:branch_1, nil)
-    branch_2 = args.fetch(:branch_2, nil)
+    branch_1 = args[:branch_1]
+    branch_2 = args[:branch_2]
 
     Ojo::Manager.new.compare(branch_1, branch_2)
   end
@@ -29,6 +29,5 @@ namespace :ojo do
     task :all => :environment do |t|
       Ojo::Manager.new.clear_all
     end
-
   end
 end

data/test/phantom/browser_test.rb

@@ -4,5 +4,8 @@ class TestAppTest < OjoApp::PhantomTestCase
   def test_index_page
     PageObjects::TestApp::IndexPage.visit
     Ojo.screenshot(branch_name, __method__)
+
+    expected_screenshot_file = File.join(Ojo.configuration.location, branch_name, "#{__method__}.png")
+    assert File.exist?(expected_screenshot_file), "the ojo screen shot file #{expected_screenshot_file} exists"
   end
 end

data/test/phantom_test_helper.rb

@@ -32,7 +32,6 @@ require 'page_objects'
 Capybara.default_driver = :poltergeist
 Capybara.javascript_driver = :poltergeist
 
-
 module OjoApp
   class PhantomTestCase < Minitest::Test
     include Capybara::DSL
@@ -40,28 +39,24 @@ module OjoApp
     def setup
       Ojo.screenshotter = lambda do |filename|
         page.save_screenshot(filename)
-        puts "Screenshot taken and saved to #{filename}"
       end
       Capybara.reset!
     end
 
     def teardown
       Capybara.reset!
+      remove_test_screenshots
     end
 
     private
 
-    def screenshot_path
-      File.join(Rails.root, 'tmp', 'screenshots')
-    end
-
-    def screenshot_file(name)
-      File.join(screenshot_path, branch_name, "#{name}.png")
-    end
-
     def branch_name
       `git rev-parse --abbrev-ref HEAD`.chomp
     end
 
+    def remove_test_screenshots
+      branch_location = File.join(Ojo.configuration.location, branch_name)
+      FileUtils.rm_rf branch_location
+    end
   end
 end

data/test/test_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    ojo (0.0.2)
+    ojo (1.0.0)
       collimator
       open4
 

data/test/unit/manager_test.rb

@@ -112,6 +112,13 @@ class ManagerTest < Ojo::OjoTestCase
       end
     end
     assert_compare_output out.string, %w(branch_1 branch_1a)
+
+    out = capture_output do
+      Date.stub :today, Date.parse('1/10/2014') do
+        @manager.compare branch_1_name, branch_2_name
+      end
+    end
+    assert_compare_output out.string, %w(branch_1 branch_2)
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ojo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - geordie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler