mirror of
https://github.com/thoughtbot/shoulda-matchers.git
synced 2022-11-09 12:01:38 -05:00
Merge branch 'no-js-runtime' of https://github.com/whitepages/shoulda-matchers
This commit is contained in:
commit
1effd72147
3 changed files with 1 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -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=>"../"
|
|
@ -4,7 +4,7 @@ FileUtils.rm_rf(TESTAPP_ROOT) if File.exists?(TESTAPP_ROOT)
|
|||
`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'
|
||||
|
|
Loading…
Reference in a new issue