diff --git a/.rspec b/.rspec index 0120179e83..97f3a5d316 100644 --- a/.rspec +++ b/.rspec @@ -1,4 +1,3 @@ --color ---fail-fast --order=random --profile diff --git a/.travis.yml b/.travis.yml index 12b92a9a27..8b0d01f157 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,17 +6,17 @@ rvm: env: - "CI_ORM=mongoid" - "CI_ORM=active_record CI_DB_ADAPTER=sqlite3" - - "CI_ORM=active_record CI_DB_ADAPTER=mysql" + - "CI_ORM=active_record CI_DB_ADAPTER=mysql2" - "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres" language: ruby matrix: exclude: - rvm: jruby-19mode - env: "CI_ORM=active_record CI_DB_ADAPTER=mysql" + env: "CI_ORM=active_record CI_DB_ADAPTER=mysql2" - rvm: jruby-19mode env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres" - rvm: 1.9.3 - env: "CI_ORM=active_record CI_DB_ADAPTER=mysql" + env: "CI_ORM=active_record CI_DB_ADAPTER=mysql2" - rvm: 1.9.3 env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres" notifications: diff --git a/Gemfile b/Gemfile index f7d650422f..563f470e74 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ source 'https://rubygems.org' group :active_record do + gem 'protected_attributes' platforms :jruby do case ENV['CI_DB_ADAPTER'] when 'mysql' @@ -17,8 +18,8 @@ group :active_record do platforms :ruby, :mswin, :mingw do case ENV['CI_DB_ADAPTER'] - when 'mysql' - gem 'mysql', '~> 2.8.1' + when 'mysql2' + gem 'mysql2', '~> 0.3.11' when 'postgresql' gem 'pg', '>= 0.14' else @@ -44,9 +45,10 @@ group :test do gem 'capybara', '~> 1.1' gem 'carrierwave', '>= 0.8' gem 'coveralls', :require => false - gem 'database_cleaner', '>= 0.8' + gem 'database_cleaner', '>= 0.8', :github => 'bmabey/database_cleaner' gem 'devise', github: 'idl3/devise', branch: 'rails4' gem 'dragonfly', '>= 0.9' + gem 'rack-cache', :require => 'rack/cache' gem 'factory_girl', '>= 4.2' gem 'generator_spec', '>= 0.8' gem 'launchy', '>= 2.2' diff --git a/spec/dummy_app/Gemfile b/spec/dummy_app/Gemfile index aab5fad0b6..177cd4cc43 100644 --- a/spec/dummy_app/Gemfile +++ b/spec/dummy_app/Gemfile @@ -1,9 +1,10 @@ source :rubygems -gem 'rails', '~> 3.2' -gem 'strong_parameters', '>= 0.1.6' +gem 'rails', '~> 4.0.0.beta1' +gem 'rack-cache', :require => 'rack/cache' group :active_record do + gem 'protected_attributes' platforms :jruby do case ENV['CI_DB_ADAPTER'] when 'mysql' @@ -20,8 +21,8 @@ group :active_record do platforms :ruby, :mswin, :mingw do case ENV['CI_DB_ADAPTER'] - when 'mysql' - gem 'mysql', '~> 2.8.1' + when 'mysql2' + gem 'mysql2', '~> 0.3.11' when 'postgresql' gem 'pg', '>= 0.14' else @@ -31,13 +32,14 @@ group :active_record do end group :mongoid do - gem 'mongoid', '>= 3.0' + gem 'mongoid', github: 'mongoid/mongoid' gem 'mongoid-paperclip', '>= 0.0.8', :require => 'mongoid_paperclip' - gem 'carrierwave-mongoid', '>= 0.4', :require => 'carrierwave/mongoid' + gem 'mongoid-grid_fs', github: 'ahoward/mongoid-grid_fs' + gem 'carrierwave-mongoid', github: 'jnicklas/carrierwave-mongoid', :require => 'carrierwave/mongoid' end gem 'carrierwave', '>= 0.8' -gem 'devise', '>= 2.2' +gem 'devise', github: 'idl3/devise', branch: 'rails4' gem 'dragonfly', '>= 0.9' gem 'mini_magick', '>= 3.4' gem 'mlb', '>= 0.6' @@ -47,8 +49,8 @@ gem 'rails_admin', :path => '../../' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails', '~> 3.2' - gem 'coffee-rails', '~> 3.2' + gem 'sass-rails', '~> 4.0.0.beta1' + gem 'coffee-rails', '~> 4.0.0.beta1' # See https://github.com/sstephenson/execjs#readme for more supported runtimes # gem 'therubyracer' diff --git a/spec/dummy_app/config/application.rb b/spec/dummy_app/config/application.rb index ef6d55c2d3..ba7bbca468 100644 --- a/spec/dummy_app/config/application.rb +++ b/spec/dummy_app/config/application.rb @@ -2,7 +2,6 @@ require "action_controller/railtie" require "action_mailer/railtie" -require "active_resource/railtie" require "sprockets/railtie" begin diff --git a/spec/dummy_app/config/routes.rb b/spec/dummy_app/config/routes.rb index 1a6424d183..7f3ab36af7 100644 --- a/spec/dummy_app/config/routes.rb +++ b/spec/dummy_app/config/routes.rb @@ -4,7 +4,7 @@ devise_for :users mount RailsAdmin::Engine => '/admin', :as => 'rails_admin' - root :to => "rails_admin::Main#dashboard" + root :to => "rails_admin/main#dashboard" # https://github.com/sferik/rails_admin/issues/362 - match ':controller(/:action(/:id(.:format)))' + get ':controller(/:action(/:id(.:format)))' end