Skip to content

Commit

Permalink
mongoid 7 is now supported
Browse files Browse the repository at this point in the history
  • Loading branch information
abrisse committed Aug 23, 2018
1 parent 9efdf99 commit fdf6c4f
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ rvm:
- 2.3.0
- 2.4.1
gemfile:
- gemfiles/Gemfile.mongoid-6
- gemfiles/Gemfile.mongoid-7
- Gemfile
services:
- mongodb
Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
source 'https://rubygems.org'

gem 'mongoid', '~> 6.0'

gem 'rake'

group :test do
Expand Down
14 changes: 14 additions & 0 deletions gemfiles/Gemfile.mongoid-6
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
source 'https://rubygems.org'

gem 'mongoid', '~> 6.0'

gem 'rake'

group :test do
gem 'database_cleaner'
gem 'coveralls', require: false
gem 'rspec', '~> 3.1'
gem 'yard'
gem 'mongoid-rspec', git: 'https://github.com/mongoid-rspec/mongoid-rspec.git'
gem 'rubocop', require: false
end
14 changes: 14 additions & 0 deletions gemfiles/Gemfile.mongoid-7
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
source 'https://rubygems.org'

gem 'mongoid', '~> 7.0'

gem 'rake'

group :test do
gem 'database_cleaner'
gem 'coveralls', require: false
gem 'rspec', '~> 3.1'
gem 'yard'
gem 'mongoid-rspec', git: 'https://github.com/mongoid-rspec/mongoid-rspec.git'
gem 'rubocop', require: false
end
2 changes: 1 addition & 1 deletion mongoid-multitenancy.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
gem.require_paths = ['lib']
gem.version = Mongoid::Multitenancy::VERSION

gem.add_dependency('mongoid', '~> 6.0')
gem.add_dependency('mongoid', '~> 6', '< 8')
end
6 changes: 0 additions & 6 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
require 'mongoid-multitenancy'
require 'mongoid-rspec'

if Mongoid::VERSION.start_with? '5'
Mongo::Logger.logger.level = ::Logger::FATAL
elsif Mongoid::VERSION.start_with? '4'
Moped.logger = nil
end

require_relative 'support/shared_examples'
require_relative 'support/mongoid_matchers'

Expand Down

0 comments on commit fdf6c4f

Please sign in to comment.