Permalink
Browse files

Merge branch 'no-js-runtime' of https://github.com/whitepages/shoulda…

  • Loading branch information...
2 parents bfe3f5e + 7660061 commit 1effd7214766d99b3c350fc7b33f317248390de4 @mike-burns mike-burns committed Nov 16, 2011
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
@@ -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
@@ -9,9 +9,7 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
gem "jdbc-sqlite3", :platform=>:jruby
gem "jruby-openssl", :platform=>:jruby
gem "rails", "3.1.0"
-gem "uglifier"
gem "jquery-rails"
-gem "coffee-rails"
gem "sass-rails"
gemspec :path=>"../"
View
@@ -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'

0 comments on commit 1effd72

Please sign in to comment.