ghostbuster 0.3.3 → 0.3.4

data/Rakefile

@@ -4,7 +4,7 @@ STDOUT.sync = true
 
 namespace :test do
   [:working_via_bin, :working_via_rake].each do |task_name|
-    desc "Run test for `working' test suite (via binary)"
+    desc "Run test for `working' test suite (#{task_name})"
     task task_name do
       print "#{task_name} ... "
       Dir.chdir("test/working_ghost") do
@@ -18,7 +18,7 @@ namespace :test do
           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
+            raise("There are a weird number of screenshots") unless Dir['*.png'].to_a.size == 15
             exit
           rescue
             puts $!.message
@@ -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, 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/]
+      matcher = [/0 success, 9 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/, /Bad click selector\s+Couldn't find element 0 for selector i-just-made-this-up/]
       fork {
         ENV['BUNDLE_GEMFILE'] = File.expand_path("./Gemfile")
         `bundle install`

data/bin/setup-ghostbuster

@@ -3,30 +3,27 @@
 case RUBY_PLATFORM
 when /darwin/
   require 'fileutils'
-  puts "Creating ghostbuster directory in your home"
   root = File.expand_path(File.join(ENV['HOME'], '.ghostbuster'))
   cache = File.expand_path(File.join(root, 'cache'))
-  unless File.exist?(File.join(root, 'version')) && File.read(File.join(root, 'version')) == '1'
+  unless File.exist?(File.join(root, 'version')) && File.read(File.join(root, 'version')) == '2'
+    puts "Creating ghostbuster directory in your home"
     FileUtils.rm_rf(root)
     FileUtils.mkdir_p(root)
     FileUtils.mkdir_p(cache)
-    phantom_url = "http://phantomjs.googlecode.com/files/phantomjs-1.2.0-macosx-universal.dmg"
+    phantom_url = "http://phantomjs.googlecode.com/files/phantomjs-1.3.0-macosx-static-x86.zip"
     unless File.exist?(File.join(cache, File.basename(phantom_url)))
       Dir.chdir(cache) do
-        puts "Downloading and install phantom.js"
+        puts "Downloading and installing phantom.js"
         system("curl #{phantom_url} -O") or raise("Unable to download from #{phantom_url}")
-        system("open #{File.basename(phantom_url)}") or raise("Unable to open disk image")
-        puts("Giving time to mount the image...")
-        system("sleep 4")
+        system("unzip #{File.basename(phantom_url)}") or raise("Unable to unzip archive")
       end
-      system("cp -r /Volumes/phantomjs/phantomjs.app #{root}")
-      File.exist?("#{root}/phantomjs.app") or raise("Unable to copy phantomjs from your disk image")
-      system("ln -s #{root}/phantomjs.app/Contents/MacOS/phantomjs #{root}/phantomjs") or raise("Unable to copy phantomjs from your disk image")
-      `hdiutil eject /Volumes/phantomjs`
-      File.open("#{root}/version", 'w') {|f| f << '1' }
-    else
-      puts "Already installed and at the right version"
+      File.exist?("#{cache}/phantomjs-1.3.0/bin/phantomjs") or raise("Unable to copy phantomjs from your disk image")
+      system("ln -s #{cache}/phantomjs-1.3.0/bin/phantomjs #{root}/phantomjs") or raise("Unable to copy phantomjs from your disk image")
+      File.open("#{root}/version", 'w') {|f| f << '2' }
+      puts "Done installing!"
     end
+  else
+    puts "Already installed and at the right version"
   end
 else
   puts "I don't know how to install for RUBY_PLATFORM #{RUBY_PLATFORM}"

data/lib/ghostbuster.coffee

@@ -123,19 +123,27 @@ class Body
     "
     @test.page.evaluate(input)
 
-  click: (selector, idx) ->
-    idx ||= 0
-    eval "
-      var fn = function() {
-        var targets = document.querySelectorAll('#{selector}'),
-            evt = document.createEvent('MouseEvents'),
-            idx = #{idx};
-        evt.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); 
-        if (idx < targets.length) targets[idx].dispatchEvent(evt);
-        else throw('Couldnt find element #{idx} for selector #{selector}');
-      };
-    "
-    @test.page.evaluate(fn)
+  click: (selector, opts) ->
+    opts ||= {}
+    test = @test
+    @test.assert opts, (withValue) ->
+      idx = opts.index || 0
+      eval "
+        var evaluator = function() {
+          var targets = document.querySelectorAll('#{selector}'),
+              evt = document.createEvent('MouseEvents'),
+              idx = #{idx};
+          evt.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); 
+          if (idx < targets.length) {
+            targets[idx].dispatchEvent(evt);
+            return true;
+          } else {
+            alert('Couldn\\'t find element #{idx} for selector #{selector}');
+            return false;
+          }
+        };
+      "
+      withValue @page.evaluate(evaluator)
 
   assertCount: (selector, opts, assertionCallback) ->
     unless assertionCallback?
@@ -339,33 +347,37 @@ class TestSuite
     @failure += failure
     @pending += pending
   run: ->
-    @screenshots    = @args[0] == 'true'
-    @screenshot_x   = @args[1]
-    @screenshot_y   = @args[2]
-    @screenshot_dir = @args[3]
-    count = 4
-    suite = this
-    runNextTest = ->
-      if suite.args.length == count
-        console.log "#{suite.success} success, #{suite.failure} failure, #{suite.pending} pending"
-        phantom.exit (if suite.failure == 0 then 0 else 1)
-      else
-        testFile = suite.args[count]
-        phantom.test = new TestFile(suite, testFile)
-        if phantom.injectJs(testFile)
-          try
-            phantom.test.run ->
+    if phantom.version.major == 1 and phantom.version.minor == 3
+      @screenshots    = @args[0] == 'true'
+      @screenshot_x   = @args[1]
+      @screenshot_y   = @args[2]
+      @screenshot_dir = @args[3]
+      count = 4
+      suite = this
+      runNextTest = ->
+        if suite.args.length == count
+          console.log "#{suite.success} success, #{suite.failure} failure, #{suite.pending} pending"
+          phantom.exit (if suite.failure == 0 then 0 else 1)
+        else
+          testFile = suite.args[count]
+          phantom.test = new TestFile(suite, testFile)
+          if phantom.injectJs(testFile)
+            try
+              phantom.test.run ->
+                count++
+                runNextTest()
+            catch e
+              console.log "For \033[1m#{testFile}\033[0m"
+              console.log "  \033[31m\u2717\033[0m #{e.toString()}"
+              suite.failure++
               count++
               runNextTest()
-          catch e
-            console.log "For \033[1m#{testFile}\033[0m"
-            console.log "  \033[31m\u2717\033[0m #{e.toString()}"
-            suite.failure++
-            count++
-            runNextTest()
-        else
-          console.log "Unable to load #{testFile}"
-    runNextTest()
+          else
+            console.log "Unable to load #{testFile}"
+      runNextTest()
+    else
+      console.log "Phantom version must be 1.3.x"
+      phantom.exit 1
 
 if phantom.args.length == 0
   console.log("You need to specify a test file")

data/lib/ghostbuster.rb

@@ -25,19 +25,31 @@ class Ghostbuster
     Dir.chdir(@dir) do
       load_config
       spinner "Starting server" do
-        sh @config.start_command
+        if @config.verbose
+          puts `#{@config.start_command}`
+          raise unless $!.success?
+        else
+          sh @config.start_command
+        end
         sleep 2
       end
       begin
         _, status = Process.waitpid2 fork { 
           exec("#{@config.phantom_bin} #{@ghost_lib} #{@config.screenshots?} #{@config.screenshot_x} #{@config.screenshot_y} #{@temporary_screenshot_dir} #{Dir[@config.pattern].to_a.join(' ')}") 
         }
-        spinner "Copying screenshots" do
-          compress_and_copy_screenshots if status.success? && @config.screenshots?
+        if status.success? && @config.screenshots?
+          spinner "Copying screenshots" do
+            compress_and_copy_screenshots
+          end
         end
       ensure
         spinner "Stopping server" do
-          sh @config.stop_command
+          if @config.verbose
+            puts `#{@config.stop_command}`
+            raise unless $!.success?
+          else
+            sh @config.stop_command
+          end
         end
         if @config.screenshots?
           spinner "Cleaning up temporary screenshots" do

data/lib/ghostbuster/config.rb

@@ -1,6 +1,6 @@
 class Ghostbuster
   class Config
-    attr_accessor :pattern, :screenshot_dir, :start_command, :stop_command, :phantom_bin, :temp_dir
+    attr_accessor :pattern, :screenshot_dir, :start_command, :stop_command, :phantom_bin, :temp_dir, :verbose
     attr_reader :screenshot_x, :screenshot_y
     def initialize(path_to_file = nil)
       @config_file = path_to_file || './Ghostfile'
@@ -9,6 +9,7 @@ class Ghostbuster
       @phantom_bin = File.join(ENV['HOME'], '.ghostbuster', 'phantomjs')
       @screenshot_dir = "."
       @screenshots = true
+      @verbose = false
       @temp_dir = "/tmp"
       @start_command, @stop_command = "./start.sh", "./stop.sh"
       if File.exist?(@config_file)

data/lib/ghostbuster/version.rb

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

data/test/non_working_ghost/test_ghost.coffee

@@ -6,6 +6,11 @@ phantom.test.add "Bad link traversal", ->
     @body.assertLocation('/not-correct')
     @succeed()
     
+phantom.test.add "Bad click selector", ->
+  @get '/', ->
+    @body.click 'i-just-made-this-up'
+    @succeed()
+
 phantom.test.add "Form input not equal", ->
   @get '/form', ->
     @body.input "#in", "this is my input"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ghostbuster
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Josh Hull
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 -07:00
+date: 2011-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: thin
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +32,12 @@ dependencies:
         - 2
         - 11
         version: 1.2.11
-  requirement: *id001
-  name: thin
   type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +48,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id002
-  name: rake
   type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +64,12 @@ dependencies:
         - 0
         - 14
         version: 1.0.14
-  requirement: *id003
-  name: bundler
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,9 +78,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  name: sinatra
   type: :development
+  version_requirements: *id004
 description: Integration testing ftw.
 email: 
 - joshbuddy@gmail.com