From 76600615dda6417eb1a687a5108a9cb51d326c29 Mon Sep 17 00:00:00 2001
From: Blake Thomson <bthomson@whitepages.com>
Date: Wed, 2 Nov 2011 08:08:15 -0700
Subject: [PATCH] Remove uglifier and coffee-rails from the 3.1 gemfile, and
 modify spec_helper.rb to respect a BUNDLE_GEMFILE set on the command line.

---
 Appraisals           | 2 --
 gemfiles/3.1.gemfile | 2 --
 spec/spec_helper.rb  | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Appraisals b/Appraisals
index 2d5e63dfc..f0ade48ec 100644
--- 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
index 4538badaa..e04407835 100644
--- 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=>"../"
\ No newline at end of file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2e318b1f9..a41d05d0f 100644
--- 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'