Merge pull request #40 from ncolgan/master

Upgrade underscore to v1.4.3 and backbone to v0.9.9
meleyal · Dec 14, 2012 · e8ad8e2 · e8ad8e2
2 parents 74bc51e + c416ed7
commit e8ad8e2
Show file tree

Hide file tree

Showing 3 changed files with 619 additions and 496 deletions.
diff --git a/test/backbone-on-rails_test.rb b/test/backbone-on-rails_test.rb
@@ -10,12 +10,12 @@ def setup
 
   test "underscore.js is found as an asset" do
     assert_not_nil @app.assets["underscore"]
-    assert_file "#{BackboneOnRails::Engine.root}/vendor/assets/javascripts/underscore.js", /1.4.2/
+    assert_file "#{BackboneOnRails::Engine.root}/vendor/assets/javascripts/underscore.js", /1.4.3/
   end
 
   test "backbone.js is found as an asset" do
     assert_not_nil @app.assets["backbone"]
-    assert_file "#{BackboneOnRails::Engine.root}/vendor/assets/javascripts/backbone.js", /0.9.2/
+    assert_file "#{BackboneOnRails::Engine.root}/vendor/assets/javascripts/backbone.js", /0.9.9/
   end
 
 end