Merge pull request jfirebaugh#34 from joliss/add-assets

Add and unignore generated asset files. Fixes jfirebaugh#33
joliss · May 9, 2012 · 04456a2 · 04456a2
2 parents 4046d5e + 4cbf46a
commit 04456a2
Show file tree

Hide file tree

Showing 5 changed files with 7,454 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,3 @@ test/version_tmp
 tmp
 node_modules
 spec/dummy/log
-vendor/assets/javascripts/mocha.js
-vendor/assets/stylesheets/mocha.css
-vendor/assets/javascripts/chai.js
diff --git a/Rakefile b/Rakefile
@@ -3,7 +3,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new :spec => :assets
+RSpec::Core::RakeTask.new :spec
 
 desc 'Build and copy Mocha and Chai assets from submodules into vendor/assets'
 task :assets do
@@ -17,6 +17,4 @@ task :assets do
   cp 'chai/chai.js',    'vendor/assets/javascripts/'
 end
 
-task :build => :assets
-
 task :default => :spec