ghostbuster 0.3.0 → 0.3.1

data/.gitignore

@@ -3,4 +3,4 @@
 Gemfile.lock
 pkg/*
 *.png
-this.log
+test/server1/log

data/Rakefile

@@ -3,45 +3,32 @@ require 'bundler/gem_tasks'
 STDOUT.sync = true
 
 namespace :test do
-  desc "Run test for `working' test suite (via binary)"
-  task :working_via_bin do
-    print "working_ghost via bin ... "
-    Dir.chdir("test/working_ghost") do
-      matcher = [/9 success, 0 failure, 1 pending/]
-      fork {
-        ENV['BUNDLE_GEMFILE'] = File.expand_path("./Gemfile")
-        `bundle install`
-        out = `bundle exec ghostbuster . 2>&1`
-        unless matcher.all?{|m|out[m]}
-          puts out
-          exit(1)
-        end
-        raise("There are a weird number of screenshots") unless Dir['*.png'].to_a.size == 12
-        exit
-      }
-      _, status = Process.wait2
-      puts status.success? ? "PASSED" : "FAILED"
-    end
-  end
-
-  desc "Run test for `working' test suite (via rake)"
-  task :working_via_rake do
-    print "working_ghost via rake ... "
-    Dir.chdir("test/working_ghost") do
-      matcher = [/9 success, 0 failure, 1 pending/]
-      fork {
-        ENV['BUNDLE_GEMFILE'] = File.expand_path("./Gemfile")
-        `bundle install`
-        out = `bundle exec rake test:ghostbuster 2>&1`
-        unless matcher.all?{|m|out[m]}
-          puts out
-          exit(1)
-        end
-        raise("There are a weird number of screenshots") unless Dir['*.png'].to_a.size == 12
-        exit
-      }
-      _, status = Process.wait2
-      puts status.success? ? "PASSED" : "FAILED"
+  [:working_via_bin, :working_via_rake].each do |task_name|
+    desc "Run test for `working' test suite (via binary)"
+    task task_name do
+      print "#{task_name} ... "
+      Dir.chdir("test/working_ghost") do
+        matcher = [/10 success, 0 failure, 1 pending/]
+        fork {
+          ENV['BUNDLE_GEMFILE'] = File.expand_path("./Gemfile")
+          `bundle install`
+          out = case task_name
+          when :working_via_rake then `bundle exec rake test:ghostbuster 2>&1`
+          when :working_via_bin  then `bundle exec ghostbuster . 2>&1`
+          end
+          begin
+            matcher.each{|m| out[m] or raise("Couldn't match for #{m.inspect}")}
+            raise("There are a weird number of screenshots") unless Dir['*.png'].to_a.size == 14
+            exit
+          rescue
+            puts $!.message
+            puts out
+            exit(1)
+          end
+        }
+        _, status = Process.wait2
+        puts status.success? ? "PASSED" : "FAILED"
+      end
     end
   end
 
@@ -49,7 +36,7 @@ namespace :test do
   task :non_working do
     print "non_working_ghost ... "
     Dir.chdir("test/non_working_ghost") do
-      matcher = [/0 success, 5 failure, 0 pending/, /Bad link traversal\s+Assert location failed: Excepted http:\/\/127\.0\.0\.1:4567\/not-correct, got http:\/\/127\.0\.0\.1:4567\//, /Form input not equal\s+Assert first for selector #out did not meet expectations/, /This test will explode!\s+I hate you!/, /This test has no succeed\s+This test took too long/]
+      matcher = [/0 success, 6 failure, 1 pending/, /Bad link traversal\s+Assert location failed: Excepted http:\/\/127\.0\.0\.1:4567\/not-correct, got http:\/\/127\.0\.0\.1:4567\//, /Form input not equal\s+Assert first for selector #out did not meet expectations/, /This test will explode!\s+I hate you!/, /This test has no succeed\s+This test took too long/]
       fork {
         ENV['BUNDLE_GEMFILE'] = File.expand_path("./Gemfile")
         `bundle install`

data/lib/ghostbuster.coffee

@@ -1,5 +1,5 @@
 class Test
-  constructor: (@runner, @name, @testBody) ->
+  constructor: (@runner, @name, @maxDuration, @testBody) ->
     @page = new WebPage()
     if @runner.useScreenshots()
       @page.viewportSize = @runner.viewportDimensions()
@@ -42,7 +42,7 @@ class Test
     @testTimer ||= setTimeout (->
       test.setLastError("This test took too long")
       test.fail()
-    ), 5000
+    ), @maxDuration
   runWithFunction: (fn, @callback) ->
     fn.call(this)
   get: (path, opts, getCallback) ->
@@ -52,7 +52,7 @@ class Test
     @waitForAssertions ->
       test = this
       fatalCallback = ->
-        test.fail("The request for #{@runner.normalizePath(path)} failed")
+        test.fail("The request for #{test.runner.normalizePath(path)} failed")
       fatal = setTimeout fatalCallback, if opts.total then opts.total * 1000 else 1000
       loadedCallback = (status) ->
         clearTimeout fatal
@@ -262,10 +262,14 @@ class TestFile
   addPending: (name, body) -> @tests.push new PendingTest(this, name)
   before: (body) -> @befores.push(body)
   after: (body) -> @afters.push(body)
-  add: (name, body) ->
+  add: (name, opts, body) ->
+    unless body?
+      body = opts
+      opts = {}
     for test in @tests
       throw("Identically named test already exists for name #{name} in #{@name}") if test.name == name
-    @tests.push new Test(this, name, body)
+    maxDuration = (opts.total || 5) * 1000
+    @tests.push new Test(this, name, maxDuration, body)
   run: (callback, idx) ->
     throw "No root is defined" unless @root?
     testFile = this

data/lib/ghostbuster/version.rb

@@ -1,3 +1,3 @@
 class Ghostbuster
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/test/non_working_ghost/Ghostfile

@@ -1,4 +1,4 @@
 ghost.pattern = "test_*.{coffee,js}"
-ghost.take_screenshots! # or do_not_takescreenshots! defaults to true
+ghost.do_not_take_screenshots! # or do_not_takescreenshots! defaults to true
 ghost.screenshot_dir = '.'
 ghost.screenshot_dimensions 800, 2000

data/test/non_working_ghost/start.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
-bundle exec thin --port 4567 -P thin.pid -d -R config.ru start
+cd ../server1
+./start.sh

data/test/non_working_ghost/stop.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
-bundle exec thin --port 4567 -P thin.pid -d -R config.ru stop
+cd ../server1
+./stop.sh

data/test/non_working_ghost/test_ghost.coffee

@@ -13,3 +13,8 @@ phantom.test.add "Form input not equal", ->
     @body.assertFirst '#out', (out) ->
       out.innerHTML == 'this is NOT my input'
     @succeed()
+
+phantom.test.addPending "To a non existent page", ->
+  @get '/404', ->
+    @succeed()
+  

data/test/non_working_ghost/test_ghostmore.coffee

@@ -7,3 +7,8 @@ phantom.test.add "This test will explode!", ->
 phantom.test.add "This test has no succeed", ->
   @get '/form', ->
     "so, like, this test sucks"
+
+phantom.test.add "This test sets its max test duration too low", total: 1, ->
+  @get '/form', ->
+    @wait 2, ->
+      @succeed()

data/test/server1/Gemfile

@@ -0,0 +1,6 @@
+source :rubygems
+
+gem 'ghostbuster', :path => '../..'
+gem 'thin'
+gem 'sinatra'
+gem 'rake'

data/test/server1/config.ru

@@ -18,6 +18,11 @@ class App < Sinatra::Base
     sleep 2
     erb :index
   end
+
+  get "/very-slow-index" do
+    sleep 7
+    erb :index
+  end
 end
 
 run App

data/test/server1/start.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec thin --port 4567 -P thin.pid -d -R config.ru start
+bundle exec thin --port 4567 -P thin.pid -d -R ./config.ru start

data/test/working_ghost/start.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
-source ../server1/start.sh
+cd ../server1
+./start.sh

data/test/working_ghost/stop.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
-source ../server1/stop.sh
+cd ../server1
+./stop.sh

data/test/working_ghost/test_ghost.coffee

@@ -27,3 +27,4 @@ phantom.test.add "Link traversal", ->
     @body.click 'a'
     @body.assertLocation('/form')
     @succeed()
+

data/test/working_ghost/test_ghostmore.coffee

@@ -24,6 +24,11 @@ phantom.test.add "Slow form", ->
       out.innerHTML == 'this is my input'
     @succeed()
 
+phantom.test.add "Simple form with specified max test duration", total: 2, ->
+  @get '/form', ->
+    @wait 1, ->
+      @succeed()
+
 phantom.test.add "Before block var", ->
   @get '/form', ->
     @body.input "#in", @var

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ghostbuster
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Josh Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 -05:00
+date: 2011-09-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,16 +108,12 @@ files:
 - lib/ghostbuster/version.rb
 - test/non_working_ghost/Gemfile
 - test/non_working_ghost/Ghostfile
-- test/non_working_ghost/config.ru
 - test/non_working_ghost/start.sh
 - test/non_working_ghost/stop.sh
 - test/non_working_ghost/test_ghost.coffee
 - test/non_working_ghost/test_ghostmore.coffee
 - test/non_working_ghost/test_withoutroot.js
-- test/non_working_ghost/views/form.erb
-- test/non_working_ghost/views/index.erb
-- test/non_working_ghost/views/slow.erb
-- test/output
+- test/server1/Gemfile
 - test/server1/config.ru
 - test/server1/start.sh
 - test/server1/stop.sh
@@ -127,15 +123,11 @@ files:
 - test/working_ghost/Gemfile
 - test/working_ghost/Ghostfile
 - test/working_ghost/Rakefile
-- test/working_ghost/config.ru
 - test/working_ghost/start.sh
 - test/working_ghost/stop.sh
 - test/working_ghost/test_ghost.coffee
 - test/working_ghost/test_ghostmore.coffee
 - test/working_ghost/test_injs.js
-- test/working_ghost/views/form.erb
-- test/working_ghost/views/index.erb
-- test/working_ghost/views/slow.erb
 has_rdoc: true
 homepage: https://github.com/joshbuddy/ghostbuster
 licenses: []
@@ -173,16 +165,12 @@ summary: Integration testing ftw
 test_files: 
 - test/non_working_ghost/Gemfile
 - test/non_working_ghost/Ghostfile
-- test/non_working_ghost/config.ru
 - test/non_working_ghost/start.sh
 - test/non_working_ghost/stop.sh
 - test/non_working_ghost/test_ghost.coffee
 - test/non_working_ghost/test_ghostmore.coffee
 - test/non_working_ghost/test_withoutroot.js
-- test/non_working_ghost/views/form.erb
-- test/non_working_ghost/views/index.erb
-- test/non_working_ghost/views/slow.erb
-- test/output
+- test/server1/Gemfile
 - test/server1/config.ru
 - test/server1/start.sh
 - test/server1/stop.sh
@@ -192,12 +180,8 @@ test_files:
 - test/working_ghost/Gemfile
 - test/working_ghost/Ghostfile
 - test/working_ghost/Rakefile
-- test/working_ghost/config.ru
 - test/working_ghost/start.sh
 - test/working_ghost/stop.sh
 - test/working_ghost/test_ghost.coffee
 - test/working_ghost/test_ghostmore.coffee
 - test/working_ghost/test_injs.js
-- test/working_ghost/views/form.erb
-- test/working_ghost/views/index.erb
-- test/working_ghost/views/slow.erb

data/test/non_working_ghost/config.ru

@@ -1,23 +0,0 @@
-require 'rubygems'
-require 'sinatra'
-
-class App < Sinatra::Base
-  get "/" do
-    erb :index
-  end
-
-  get "/form" do
-    erb :form
-  end
-
-  get "/slow" do
-    erb :slow
-  end
-
-  get "/slow-index" do
-    sleep 2
-    erb :index
-  end
-end
-
-run App

data/test/non_working_ghost/views/form.erb

@@ -1,12 +0,0 @@
-<html>
-<head>
-  <title>This is my index</title>
-</head>
-<body>
-  <form>
-  <input type="text" id="in">
-  <input type="button" id="btn" onclick="document.getElementById('out').innerHTML = document.getElementById('in').value;">  
-  </form>
-  <p id="out"></p>
-</body>
-</html>

data/test/non_working_ghost/views/index.erb

@@ -1,15 +0,0 @@
-<html>
-<head>
-  <title>This is my index</title>
-</head>
-<body>
-  <h1>First header</h1>
-  <p>This is my paragraph</p>
-  <ul>
-    <li>List item 1</li>
-    <li>List item 2</li>
-    <li>List item 3</li>
-  </ul>
-  <a href="/form">form</a>
-</body>
-</html>

data/test/non_working_ghost/views/slow.erb

@@ -1,12 +0,0 @@
-<html>
-<head>
-  <title>This is my index</title>
-</head>
-<body>
-  <form>
-  <input type="text" id="in">
-  <input type="button" id="btn" onclick="setTimeout( function() { document.getElementById('out').innerHTML = document.getElementById('in').value;}, 2000);">  
-  </form>
-  <p id="out"></p>
-</body>
-</html>

data/test/output

@@ -1,31 +0,0 @@
-(in /Users/joshbuddy/Development/ghostbuster)
-Starting server
-GhostBuster
-For test_ghost.coffee
-  ✓ Simple index
-  ✓ Simple slow index
-  ✓ Form input
-  ✓ Link traversal
-  ✗ Bad link traversal
-    Assert location failed: Excepted http://127.0.0.1:4567/not-correct, got http://127.0.0.1:4567/
-  ✗ Form input not equal
-    Assert first for selector #out did not meet expectations
-
-For test_ghostmore.coffee
-  ✓ Simple form
-  ◐ Form should do more things
-  ✓ Simple form with wait
-  ✓ Slow form
-  ✓ Before block var
-  ✗ This test will explode!
-    I hate you!
-  ✗ This test has no succeed
-    This test took too long
-
-For test_injs.js
-  ✓ Test for 3 li's
-
-For test_withoutroot.js
-  ✗ No root is defined
-9 success, 5 failure, 1 pending
-Stopping server

data/test/working_ghost/config.ru

@@ -1,23 +0,0 @@
-require 'rubygems'
-require 'sinatra'
-
-class App < Sinatra::Base
-  get "/" do
-    erb :index
-  end
-
-  get "/form" do
-    erb :form
-  end
-
-  get "/slow" do
-    erb :slow
-  end
-
-  get "/slow-index" do
-    sleep 2
-    erb :index
-  end
-end
-
-run App

data/test/working_ghost/views/form.erb

@@ -1,12 +0,0 @@
-<html>
-<head>
-  <title>This is my index</title>
-</head>
-<body>
-  <form>
-  <input type="text" id="in">
-  <input type="button" id="btn" onclick="document.getElementById('out').innerHTML = document.getElementById('in').value;">  
-  </form>
-  <p id="out"></p>
-</body>
-</html>

data/test/working_ghost/views/index.erb

@@ -1,15 +0,0 @@
-<html>
-<head>
-  <title>This is my index</title>
-</head>
-<body>
-  <h1>First header</h1>
-  <p>This is my paragraph</p>
-  <ul>
-    <li>List item 1</li>
-    <li>List item 2</li>
-    <li>List item 3</li>
-  </ul>
-  <a href="/form">form</a>
-</body>
-</html>

data/test/working_ghost/views/slow.erb

@@ -1,12 +0,0 @@
-<html>
-<head>
-  <title>This is my index</title>
-</head>
-<body>
-  <form>
-  <input type="text" id="in">
-  <input type="button" id="btn" onclick="setTimeout( function() { document.getElementById('out').innerHTML = document.getElementById('in').value;}, 2000);">  
-  </form>
-  <p id="out"></p>
-</body>
-</html>