Skip to content

Commit

Permalink
johnson, mustang disabled, updated Guardfile
Browse files Browse the repository at this point in the history
  • Loading branch information
Piotr Gega (pietia) committed Feb 21, 2012
1 parent ec78ca8 commit baf2424
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 17 deletions.
6 changes: 0 additions & 6 deletions Guardfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,3 @@ guard 'minitest' do

watch(%r|test_helper\.rb|){ "test" }
end

guard 'jasmine-headless-webkit' do
watch(%r{^test/resources/test_app/assets/javascripts/(.*)\..*}) do |m|
newest_js_file("test/jasmine/spec/#{m[1]}_spec")
end
end
9 changes: 0 additions & 9 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,3 @@ Rake::TestTask.new do |t|
end

task :default => :test

begin
require 'jasmine'
load 'jasmine/tasks/jasmine.rake'
rescue LoadError
task :jasmine do
abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"
end
end
4 changes: 2 additions & 2 deletions spinaltap.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ Gem::Specification.new do |s|
s.add_development_dependency "mocha", "~> 0.10.3"
s.add_development_dependency "coffee-script", "~> 2.2.0"
s.add_development_dependency "execjs", "~> 1.3.0"
s.add_development_dependency "johnson"
s.add_development_dependency "mustang"
# s.add_development_dependency "johnson"
# s.add_development_dependency "mustang"
s.add_development_dependency "therubyracer"
s.add_development_dependency "therubyrhino"

Expand Down
1 change: 1 addition & 0 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
require 'rails'
require 'rails/generators/test_case'
require 'mocha'
require 'execjs'

# we load only main file which loads all others
require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'spinaltap'))
Expand Down

0 comments on commit baf2424

Please sign in to comment.