ghostbuster 0.3.2 → 0.3.3

data/Rakefile

@@ -36,7 +36,7 @@ namespace :test do
   task :non_working do
     print "non_working_ghost ... "
     Dir.chdir("test/non_working_ghost") do
-      matcher = [/0 success, 7 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/, /To an invalid URL\s+The request for http:\/\/127\.0\.0\.1:this-url-is-invalid failed/, /This test will explode!\s+I hate you!/, /This test has no succeed\s+This test took too long/]
+      matcher = [/0 success, 8 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/, /To an invalid URL\s+The request for http:\/\/127\.0\.0\.1:this-url-is-invalid failed/, /This test will explode!\s+I hate you!/, /This test has no succeed\s+This test took too long/, /This test has a custom assertion name\s+Assert first "custom assertion name" did not meet expectations/]
       fork {
         ENV['BUNDLE_GEMFILE'] = File.expand_path("./Gemfile")
         `bundle install`

data/lib/ghostbuster.coffee

@@ -143,7 +143,8 @@ class Body
       opts = {}
     test = @test
     @test.assert opts, (withValue) ->
-      alerter = if test.getLastError()? then "" else "alert('Assert count for selector #{selector} did not meet expectations, last count is '+count);"
+      assertionDescription = if opts.name then "\"#{opts.name}\"" else "for selector #{selector}"
+      alerter = if test.getLastError()? then "" else "alert('Assert count #{assertionDescription} did not meet expectations, last count is '+count);"
       eval "
         var evaluator = function() {
           try {
@@ -171,7 +172,8 @@ class Body
     test = @test
     location = @test.runner.normalizePath(path)
     @test.assert opts, (withValue) ->
-      alerter = if test.getLastError()? then "" else "alert('Assert location failed: Excepted #{location}, got '+currentLocation);"
+      assertionDescription = if opts.name then " \"#{opts.name}\"" else ""
+      alerter = if test.getLastError()? then "" else "alert('Assert location#{assertionDescription} failed: Excepted #{location}, got '+currentLocation);"
       eval "
         var fn = function() {
           var currentLocation = window.location.href;
@@ -191,7 +193,8 @@ class Body
       opts = {}
     test = @test
     @test.assert opts, (withValue) ->
-      alerter = if test.getLastError()? then "" else "alert('Assert first for selector #{selector} did not meet expectations');"
+      assertionDescription = if opts.name then "\"#{opts.name}\"" else "for selector #{selector}"
+      alerter = if test.getLastError()? then "" else "alert('Assert first #{assertionDescription} did not meet expectations');"
       eval "
         var evaluator = function() {
           try {
@@ -218,6 +221,7 @@ class Body
       assertionCallback = opts
       opts = {}
     @test.assert opts, (withValue) ->
+      assertionDescription = if opts.name then "\"#{opts.name}\"" else "for selector #{selector}"
       eval "
         var evaluator = function() {
           try {
@@ -226,7 +230,7 @@ class Body
             if (list.length == 0) throw('list is empty');
             for (var i=0; i != list.length; i++) {
               if (!assertionCallback(list[i], i)) {
-                alert('Assert all for selector #{selector} on item '+i+' didn\\'t meet expectations');
+                alert('Assert all #{assertionDescription} on item '+i+' didn\\'t meet expectations');
                 return false;
               }
             }

data/lib/ghostbuster.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'fileutils'
 require 'digest/md5'
 

data/lib/ghostbuster/version.rb

@@ -1,3 +1,3 @@
 class Ghostbuster
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/test/non_working_ghost/test_ghostmore.coffee

@@ -8,6 +8,12 @@ phantom.test.add "This test has no succeed", ->
   @get '/form', ->
     "so, like, this test sucks"
 
+phantom.test.add "This test has a custom assertion name", ->
+  @get '/form', ->
+    @body.assertFirst '#out', name: "custom assertion name", (out) ->
+      out.innerHTML == 'this definitely is NOT my input'
+    @succeed()
+
 phantom.test.add "This test sets its max test duration too low", total: 1, ->
   @get '/form', ->
     @wait 2, ->

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ghostbuster
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Josh Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 -07:00
+date: 2011-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency