ghostbuster 0.2.0 → 0.2.1

data/README.md

@@ -10,7 +10,7 @@ To install first `gem install ghostbuster`. Once you've done that, you can run `
 
 Once installed, you can simply use `ghostbuster [path/to/Ghostfile]` to run your tests.
 
-## `Ghostfile`
+## Ghostfile
 
 Your `Ghostfile` handles your configuration. To set the pattern use:
 
@@ -21,7 +21,7 @@ Your `Ghostfile` handles your configuration. To set the pattern use:
 To enable (or disable) screenshots use:
 
 ~~~~
-  ghost.take_screenshots! # or #do_not_takescreenshots! defaults to take_screenshots!
+    ghost.take_screenshots! # or #do_not_takescreenshots! defaults to take_screenshots!
 ~~~~
 
 To set the directory your screenshots will save to use:
@@ -36,6 +36,20 @@ To set the dimensions for the screenshots use:
     ghost.screenshot_dimensions 800, 2000 # x, y
 ~~~~
 
+To set the command for starting your server use:
+
+~~~~
+    ghost.start_command "./start.sh"
+~~~~
+
+To set the command for stopping your server use:
+
+~~~~
+    ghost.stop_command "./stop.sh"
+~~~~
+
+
+
 If no Ghostfile is found, it will simply use the defaults.
 
 You should get some output that looks something like this.

data/ghost/test_ghostmore.coffee

@@ -33,4 +33,8 @@ phantom.test.add "Before block var", ->
     @succeed()
 
 phantom.test.add "This test will explode!", ->
-  throw "I hate you!"
+  throw "I hate you!"
+
+phantom.test.add "This test has no succeed", ->
+  @get '/form', ->
+    "so, like, this test sucks"

data/lib/ghostbuster/config.rb

@@ -1,7 +1,6 @@
 class Ghostbuster
   class Config
-
-    attr_accessor :pattern, :screenshot_dir
+    attr_accessor :pattern, :screenshot_dir, :start_command, :stop_command
     attr_reader :screenshot_x, :screenshot_y
     def initialize(path_to_file = nil)
       @config_file = path_to_file || './Ghostfile'
@@ -9,6 +8,7 @@ class Ghostbuster
       @pattern = "./test_*.coffee"
       @screenshot_dir = "."
       @screenshots = true
+      @start_command, @stop_command = "./start.sh", "./stop.sh"
       if File.exist?(@config_file)
         instance_eval File.read(@config_file), @config_file, 1
       end

data/lib/ghostbuster/version.rb

@@ -1,3 +1,3 @@
 class Ghostbuster
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/ghostbuster.coffee

@@ -16,7 +16,9 @@ class Test
   setLastError: (error) ->
     @runner.lastErrors[@name] = error
   waitForAssertions: (whenDone) ->
+    @stopTestTimer()
     if @assertions.length == 0
+      @startTestTimer()
       whenDone.call(this)
     else
       test = this
@@ -25,7 +27,18 @@ class Test
       setTimeout waiting, 10
   actuallyRun: -> true
   run: (callback) ->
+    @startTestTimer()
     @runWithFunction(@testBody, callback)
+  stopTestTimer: ->
+    if @testTimer?
+      clearTimeout @testTimer
+      @testTimer = null
+  startTestTimer: ->
+    test = this
+    @testTimer ||= setTimeout (->
+      test.setLastError("This test took too long")
+      test.fail()
+    ), 5000
   runWithFunction: (fn, @callback) ->
     fn.call(this)
   get: (path, getCallback) ->
@@ -43,8 +56,10 @@ class Test
       @page.open @runner.normalizePath(path), loadedCallback
   succeed: ->
     @waitForAssertions ->
+      @stopTestTimer()
       @callback(true)
   fail: (msg) ->
+    @stopTestTimer()
     @callback(false, msg)
   assert: (opts, valueFetcher) ->
     @assertions.push(new Assertion(this, ++@assertionIndex, opts, valueFetcher))
@@ -65,6 +80,7 @@ class Assertion
     failedCallback    = ->
       assertion.start()
     if @count == 0
+      test.stopTestTimer()
       fatalCallback = ->
         test.fail(test.getLastError() || "This assertion failed to complete.")
       @fatal = setTimeout(fatalCallback, assertion.totalTime)
@@ -72,6 +88,7 @@ class Assertion
       assertion.count++
       if val == true
         test.resetLastError()
+        test.startTestTimer()
         test.assertions.splice(test.assertions.indexOf(assertion), 1)
         clearTimeout assertion.fatal
         if test.runner.useScreenshots()
@@ -229,6 +246,7 @@ class TestFile
                 testStates[test.name] = state
                 nextTest(count + 1)
             catch e
+              test.stopTestTimer()
               testFile.lastErrors[test.name] = e.toString()
               testStates[test.name] = false
               nextTest(count + 1)

data/lib/ghostbuster.rb

@@ -21,14 +21,14 @@ class Ghostbuster
     status = 1
     Dir.chdir(@dir) do
       spinner "Starting server" do
-        sh "./start.sh"
+        sh @config.start_command
         sleep 2
       end
       begin
         _, status = Process.waitpid2 fork { exec("#{@phantom_bin} #{@ghost_lib} #{@config.screenshots?} #{@config.screenshot_x} #{@config.screenshot_y} #{File.expand_path(@config.screenshot_dir)} #{Dir[@config.pattern].to_a.join(' ')}") }
       ensure
         spinner "Stopping server" do
-          sh "./stop.sh"
+          sh @config.stop_command
         end
       end
     end

data/test/output

@@ -18,6 +18,8 @@ For test_ghostmore.coffee
   ✓ Before block var
   ✗ This test will explode!
     I hate you!
+  ✗ This test has no succeed
+    This test took too long
 
-7 success, 3 failure, 1 pending
+7 success, 4 failure, 1 pending
 Stopping server

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ghostbuster
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Josh Hull