Skip to content
This repository has been archived by the owner on Jun 10, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' into sass
Browse files Browse the repository at this point in the history
  • Loading branch information
josh committed Dec 19, 2011
2 parents 8341a4f + 6af4e53 commit 0ec3a99
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions sprockets.gemspec
Expand Up @@ -16,6 +16,7 @@ Gem::Specification.new do |s|
s.add_dependency "tilt", ["~> 1.1", "!= 1.3.0"] s.add_dependency "tilt", ["~> 1.1", "!= 1.3.0"]


s.add_development_dependency "coffee-script", "~> 2.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 "eco", "~> 1.0"
s.add_development_dependency "ejs", "~> 1.0" s.add_development_dependency "ejs", "~> 1.0"
s.add_development_dependency "execjs", "~> 1.0" s.add_development_dependency "execjs", "~> 1.0"
Expand Down
2 changes: 1 addition & 1 deletion test/test_environment.rb
Expand Up @@ -414,7 +414,7 @@ def setup
File.open(filename, 'w') { |f| f.puts "->" } File.open(filename, 'w') { |f| f.puts "->" }
time = Time.now + 60 time = Time.now + 60
File.utime(time, time, filename) 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
end end


Expand Down
4 changes: 2 additions & 2 deletions test/test_sprocketize.rb
Expand Up @@ -34,7 +34,7 @@ def teardown
end end


test "error if load path is missing" do 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 assert_equal 1, $?.exitstatus
end end


Expand All @@ -44,7 +44,7 @@ def teardown
end end


test "show error if multiple files are given" do 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 assert_equal 1, $?.exitstatus
end end


Expand Down

0 comments on commit 0ec3a99

Please sign in to comment.