Permalink
Browse files

Merge branch 'master' into sass

  • Loading branch information...
2 parents 8341a4f + 6af4e53 commit 0ec3a998466b1443e499f0c6b7bb59054ea23469 @josh josh committed Dec 19, 2011
Showing with 4 additions and 3 deletions.
  1. +1 −0 sprockets.gemspec
  2. +1 −1 test/test_environment.rb
  3. +2 −2 test/test_sprocketize.rb
View
1 sprockets.gemspec
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
s.add_dependency "tilt", ["~> 1.1", "!= 1.3.0"]
s.add_development_dependency "coffee-script", "~> 2.0"
+ s.add_development_dependency "coffee-script-source", "~> 1.2.0"
s.add_development_dependency "eco", "~> 1.0"
s.add_development_dependency "ejs", "~> 1.0"
s.add_development_dependency "execjs", "~> 1.0"
View
2 test/test_environment.rb
@@ -414,7 +414,7 @@ def setup
File.open(filename, 'w') { |f| f.puts "->" }
time = Time.now + 60
File.utime(time, time, filename)
- assert_equal "\n (function() {});\n", @env["tmp.js"].to_s
+ assert_equal "(function() {\n\n (function() {});\n\n}).call(this);\n", @env["tmp.js"].to_s
end
end
View
4 test/test_sprocketize.rb
@@ -34,7 +34,7 @@ def teardown
end
test "error if load path is missing" do
- output = sprockets fixture_path("default/gallery.js")
+ sprockets fixture_path("default/gallery.js")
assert_equal 1, $?.exitstatus
end
@@ -44,7 +44,7 @@ def teardown
end
test "show error if multiple files are given" do
- output = sprockets fixture_path("default/gallery.js"), fixture_path("default/application.js")
+ sprockets fixture_path("default/gallery.js"), fixture_path("default/application.js")
assert_equal 1, $?.exitstatus
end

0 comments on commit 0ec3a99

Please sign in to comment.