Update test app dependencies

This commit is contained in:
Erik Michaels-Ober 2013-11-29 09:30:37 +01:00
parent f5c19a535b
commit 428e0eb84f
2 changed files with 5 additions and 7 deletions

View File

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '3.2.12' gem 'rails', '~> 3.2'
gem 'impressionist', :path => '../../' gem 'impressionist', :path => '../../'
@ -14,7 +14,7 @@ platforms :ruby, :mswin, :mingw do
gem 'pg' gem 'pg'
gem 'sqlite3' gem 'sqlite3'
gem 'mysql2' gem 'mysql2'
gem "mongoid", "~> 3.1.4" gem 'mongoid', '~> 3.1'
gem 'bson_ext' gem 'bson_ext'
end end
@ -23,8 +23,8 @@ gem 'json'
# Gems used only for assets and not required # Gems used only for assets and not required
# in production environments by default. # in production environments by default.
group :assets do group :assets do
gem 'sass-rails', '~> 3.2.3' gem 'sass-rails', '~> 3.2'
gem 'coffee-rails', '~> 3.2.1' gem 'coffee-rails', '~> 3.2'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes # See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer' # gem 'therubyracer'
@ -39,10 +39,9 @@ group :development, :test do
end end
group :test do group :test do
gem 'capybara'
gem 'simplecov' gem 'simplecov'
gem 'systemu' gem 'systemu'
gem 'capybara', '~> 2.0.0'
end end
gem 'jquery-rails' gem 'jquery-rails'

View File

@ -10,5 +10,4 @@
// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
// GO AFTER THE REQUIRES BELOW. // GO AFTER THE REQUIRES BELOW.
// //
//= require jquery_ujs
//= require_tree . //= require_tree .