Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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.
  • Loading branch information...
commit 76600615dda6417eb1a687a5108a9cb51d326c29 1 parent 22740fd
Blake Thomson authored
Showing with 1 addition and 5 deletions.
  1. +0 −2  Appraisals
  2. +0 −2  gemfiles/3.1.gemfile
  3. +1 −1  spec/spec_helper.rb
View
2  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
View
2  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=>"../"
View
2  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'
Please sign in to comment.
Something went wrong with that request. Please try again.