Remove uglifier and coffee-rails from the 3.1 gemfile, and modify spe…

…c_helper.rb to respect a BUNDLE_GEMFILE set on the command line.
whitepages · Nov 2, 2011 · 7660061 · 7660061
1 parent 22740fd
commit 7660061
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/Appraisals b/Appraisals
@@ -4,8 +4,6 @@ end
 
 appraise "3.1" do
   gem "rails", "3.1.0"
-  gem 'uglifier'
   gem 'jquery-rails'
-  gem 'coffee-rails'
   gem 'sass-rails'
 end
diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
@@ -10,9 +10,7 @@ gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "shoulda-context", "~> 1.0.0.beta1"
 gem "rails", "3.1.0"
-gem "uglifier"
 gem "jquery-rails"
-gem "coffee-rails"
 gem "sass-rails"
 
 gemspec :path=>"../"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -4,7 +4,7 @@
 `rails new #{TESTAPP_ROOT}`
 
 ENV['RAILS_ENV'] = 'test'
-ENV['BUNDLE_GEMFILE'] = TESTAPP_ROOT + '/Gemfile'
+ENV['BUNDLE_GEMFILE'] ||= TESTAPP_ROOT + '/Gemfile'
 
 require "#{TESTAPP_ROOT}/config/environment"
 require 'rspec'