Skip to content

Commit

Permalink
Test with Mongoid 6.0.0.beta
Browse files Browse the repository at this point in the history
  • Loading branch information
mshibuya committed Jul 18, 2016
1 parent cebaa0e commit 2653f0a
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 17 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,12 @@ matrix:
- rvm: jruby-head
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
gemfile: gemfiles/rails_5.0.gemfile
exclude:
- rvm: 2.3.1
env: CI_ORM=mongoid
gemfile: gemfiles/rails_5.0.gemfile
allow_failures:
- rvm: jruby-head
- rvm: rbx-2
- rvm: ruby-head
- env: CI_ORM=mongoid
gemfile: gemfiles/rails_5.0.gemfile
fast_finish: true

notifications:
Expand Down
16 changes: 13 additions & 3 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ appraise "rails-4.0" do
gem 'capybara', '>= 0.8', group: :test

group :mongoid do
gem 'mongoid', '~> 4.0.0'
gem 'mongoid', '~> 4.0'
gem 'kaminari-mongoid'
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
gem 'refile-mongoid', '>= 0.0.1', platforms: [:ruby_21, :ruby_22, :ruby_23]
Expand All @@ -24,7 +25,8 @@ appraise "rails-4.1" do
gem 'capybara', '>= 0.8', group: :test

group :mongoid do
gem 'mongoid', '~> 4.0.0'
gem 'mongoid', '~> 4.0'
gem 'kaminari-mongoid'
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
gem 'refile-mongoid', '>= 0.0.1', platforms: [:ruby_21, :ruby_22, :ruby_23]
Expand All @@ -43,7 +45,8 @@ appraise "rails-4.2" do
gem 'capybara', '>= 0.8', group: :test

group :mongoid do
gem 'mongoid', '~> 4.0.0'
gem 'mongoid', '~> 4.0'
gem 'kaminari-mongoid'
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
gem 'refile-mongoid', '>= 0.0.1', platforms: [:ruby_21, :ruby_22, :ruby_23]
Expand All @@ -60,4 +63,11 @@ appraise "rails-5.0" do
gem 'sass-rails', '~> 5.0'
gem 'devise', '~> 4.0'
gem 'remotipart', github: 'mshibuya/remotipart'

group :mongoid do
gem 'mongoid', '>= 6.0.0.beta'
gem 'kaminari-mongoid'
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
end
end
3 changes: 2 additions & 1 deletion gemfiles/rails_4.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ group :test do
end

group :mongoid do
gem "mongoid", "~> 4.0.0"
gem "mongoid", "~> 4.0"
gem "kaminari-mongoid"
gem "mongoid-paperclip", ">= 0.0.8", :require => "mongoid_paperclip"
gem "carrierwave-mongoid", ">= 0.6.3", :require => "carrierwave/mongoid"
gem "refile-mongoid", ">= 0.0.1", :platforms => [:ruby_21, :ruby_22, :ruby_23]
Expand Down
3 changes: 2 additions & 1 deletion gemfiles/rails_4.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ group :test do
end

group :mongoid do
gem "mongoid", "~> 4.0.0"
gem "mongoid", "~> 4.0"
gem "kaminari-mongoid"
gem "mongoid-paperclip", ">= 0.0.8", :require => "mongoid_paperclip"
gem "carrierwave-mongoid", ">= 0.6.3", :require => "carrierwave/mongoid"
gem "refile-mongoid", ">= 0.0.1", :platforms => [:ruby_21, :ruby_22, :ruby_23]
Expand Down
3 changes: 2 additions & 1 deletion gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ group :test do
end

group :mongoid do
gem "mongoid", "~> 4.0.0"
gem "mongoid", "~> 4.0"
gem "kaminari-mongoid"
gem "mongoid-paperclip", ">= 0.0.8", :require => "mongoid_paperclip"
gem "carrierwave-mongoid", ">= 0.6.3", :require => "carrierwave/mongoid"
gem "refile-mongoid", ">= 0.0.1", :platforms => [:ruby_21, :ruby_22, :ruby_23]
Expand Down
7 changes: 7 additions & 0 deletions gemfiles/rails_5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,11 @@ group :test do
end
end

group :mongoid do
gem "mongoid", ">= 6.0.0.beta"
gem "kaminari-mongoid"
gem "mongoid-paperclip", ">= 0.0.8", :require => "mongoid_paperclip"
gem "carrierwave-mongoid", ">= 0.6.3", :require => "carrierwave/mongoid"
end

gemspec :path => "../"
15 changes: 8 additions & 7 deletions spec/dummy_app/Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.0'
gem 'rails', '~> 5.0.0'
gem 'rack-cache', require: 'rack/cache'

group :active_record do
Expand All @@ -19,14 +19,14 @@ group :active_record do
gem 'sqlite3', '>= 1.3'
end

gem 'paper_trail', '~> 3.0'
gem 'paper_trail', '~> 5.0'
end

group :mongoid do
gem 'mongoid', '~> 4.0.0.beta1'
gem 'mongoid', '~> 6.0.0.beta'
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
gem 'refile-mongoid', '>= 0.0.1', platforms: [:ruby_21, :ruby_22]
# gem 'refile-mongoid', '>= 0.0.1', platforms: [:ruby_21, :ruby_22]
end

gem 'carrierwave', '>= 0.8'
Expand All @@ -35,17 +35,18 @@ gem 'dragonfly', '~> 1.0'
gem 'mini_magick', '>= 3.4'
gem 'mlb', '>= 0.7'
gem 'paperclip', '>= 3.4'
gem 'remotipart', github: 'mshibuya/remotipart'
gem 'rails_admin', path: '../../'

platforms :ruby_21, :ruby_22 do
gem 'refile', '~> 0.5', require: 'refile/rails'
gem 'refile-mini_magick', '>= 0.1.0'
# gem 'refile', '>= 0.5', require: 'refile/rails'
# gem 'refile-mini_magick', '>= 0.1.0'
end

# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 4.0.3'
gem 'sass-rails', '>= 4.0.3'
gem 'coffee-rails', '~> 4.0'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
Expand Down
1 change: 1 addition & 0 deletions spec/dummy_app/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
require 'sprockets/railtie'

begin
require "#{CI_ORM}"
require "#{CI_ORM}/railtie"
rescue LoadError # rubocop:disable HandleExceptions
end
Expand Down
10 changes: 10 additions & 0 deletions spec/dummy_app/config/mongoid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ development:
database: dummy_app_development
hosts:
- localhost:27017
clients:
default:
database: dummy_app_development
hosts:
- localhost:27017


test:
Expand All @@ -20,3 +25,8 @@ test:
database: dummy_app_test
hosts:
- localhost:27017
clients:
default:
database: dummy_app_test
hosts:
- localhost:27017

0 comments on commit 2653f0a

Please sign in to comment.