Skip to content

Commit 4742327

Browse files
committed
Make CI runnable for AR
1 parent 2b18e34 commit 4742327

File tree

6 files changed

+21
-19
lines changed

6 files changed

+21
-19
lines changed

.rspec

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
--color
2-
--fail-fast
32
--order=random
43
--profile

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ rvm:
66
env:
77
- "CI_ORM=mongoid"
88
- "CI_ORM=active_record CI_DB_ADAPTER=sqlite3"
9-
- "CI_ORM=active_record CI_DB_ADAPTER=mysql"
9+
- "CI_ORM=active_record CI_DB_ADAPTER=mysql2"
1010
- "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
1111
language: ruby
1212
matrix:
1313
exclude:
1414
- rvm: jruby-19mode
15-
env: "CI_ORM=active_record CI_DB_ADAPTER=mysql"
15+
env: "CI_ORM=active_record CI_DB_ADAPTER=mysql2"
1616
- rvm: jruby-19mode
1717
env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
1818
- rvm: 1.9.3
19-
env: "CI_ORM=active_record CI_DB_ADAPTER=mysql"
19+
env: "CI_ORM=active_record CI_DB_ADAPTER=mysql2"
2020
- rvm: 1.9.3
2121
env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
2222
notifications:

Gemfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
source 'https://rubygems.org'
22

33
group :active_record do
4+
gem 'protected_attributes'
45
platforms :jruby do
56
case ENV['CI_DB_ADAPTER']
67
when 'mysql'
@@ -17,8 +18,8 @@ group :active_record do
1718

1819
platforms :ruby, :mswin, :mingw do
1920
case ENV['CI_DB_ADAPTER']
20-
when 'mysql'
21-
gem 'mysql', '~> 2.8.1'
21+
when 'mysql2'
22+
gem 'mysql2', '~> 0.3.11'
2223
when 'postgresql'
2324
gem 'pg', '>= 0.14'
2425
else
@@ -44,9 +45,10 @@ group :test do
4445
gem 'capybara', '~> 1.1'
4546
gem 'carrierwave', '>= 0.8'
4647
gem 'coveralls', :require => false
47-
gem 'database_cleaner', '>= 0.8'
48+
gem 'database_cleaner', '>= 0.8', :github => 'bmabey/database_cleaner'
4849
gem 'devise', github: 'idl3/devise', branch: 'rails4'
4950
gem 'dragonfly', '>= 0.9'
51+
gem 'rack-cache', :require => 'rack/cache'
5052
gem 'factory_girl', '>= 4.2'
5153
gem 'generator_spec', '>= 0.8'
5254
gem 'launchy', '>= 2.2'

spec/dummy_app/Gemfile

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
source :rubygems
22

3-
gem 'rails', '~> 3.2'
4-
gem 'strong_parameters', '>= 0.1.6'
3+
gem 'rails', '~> 4.0.0.beta1'
4+
gem 'rack-cache', :require => 'rack/cache'
55

66
group :active_record do
7+
gem 'protected_attributes'
78
platforms :jruby do
89
case ENV['CI_DB_ADAPTER']
910
when 'mysql'
@@ -20,8 +21,8 @@ group :active_record do
2021

2122
platforms :ruby, :mswin, :mingw do
2223
case ENV['CI_DB_ADAPTER']
23-
when 'mysql'
24-
gem 'mysql', '~> 2.8.1'
24+
when 'mysql2'
25+
gem 'mysql2', '~> 0.3.11'
2526
when 'postgresql'
2627
gem 'pg', '>= 0.14'
2728
else
@@ -31,13 +32,14 @@ group :active_record do
3132
end
3233

3334
group :mongoid do
34-
gem 'mongoid', '>= 3.0'
35+
gem 'mongoid', github: 'mongoid/mongoid'
3536
gem 'mongoid-paperclip', '>= 0.0.8', :require => 'mongoid_paperclip'
36-
gem 'carrierwave-mongoid', '>= 0.4', :require => 'carrierwave/mongoid'
37+
gem 'mongoid-grid_fs', github: 'ahoward/mongoid-grid_fs'
38+
gem 'carrierwave-mongoid', github: 'jnicklas/carrierwave-mongoid', :require => 'carrierwave/mongoid'
3739
end
3840

3941
gem 'carrierwave', '>= 0.8'
40-
gem 'devise', '>= 2.2'
42+
gem 'devise', github: 'idl3/devise', branch: 'rails4'
4143
gem 'dragonfly', '>= 0.9'
4244
gem 'mini_magick', '>= 3.4'
4345
gem 'mlb', '>= 0.6'
@@ -47,8 +49,8 @@ gem 'rails_admin', :path => '../../'
4749
# Gems used only for assets and not required
4850
# in production environments by default.
4951
group :assets do
50-
gem 'sass-rails', '~> 3.2'
51-
gem 'coffee-rails', '~> 3.2'
52+
gem 'sass-rails', '~> 4.0.0.beta1'
53+
gem 'coffee-rails', '~> 4.0.0.beta1'
5254

5355
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
5456
# gem 'therubyracer'

spec/dummy_app/config/application.rb

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
require "action_controller/railtie"
44
require "action_mailer/railtie"
5-
require "active_resource/railtie"
65
require "sprockets/railtie"
76

87
begin

spec/dummy_app/config/routes.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
devise_for :users
66
mount RailsAdmin::Engine => '/admin', :as => 'rails_admin'
7-
root :to => "rails_admin::Main#dashboard"
7+
root :to => "rails_admin/main#dashboard"
88
# https://github.com/sferik/rails_admin/issues/362
9-
match ':controller(/:action(/:id(.:format)))'
9+
get ':controller(/:action(/:id(.:format)))'
1010
end

0 commit comments

Comments
 (0)