From 75822dae4f9965d7a891535d07d91f4867fc30cf Mon Sep 17 00:00:00 2001 From: Alexander Karmes Date: Wed, 16 Sep 2015 23:06:45 +0200 Subject: [PATCH 1/4] Update required major version of mongoid to 5 --- mongoid-enum.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongoid-enum.gemspec b/mongoid-enum.gemspec index 55082c7..93498f8 100644 --- a/mongoid-enum.gemspec +++ b/mongoid-enum.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_runtime_dependency "mongoid", "~> 4.0" + spec.add_runtime_dependency "mongoid", "~> 5.0" spec.add_development_dependency "bundler", "~> 1.3" spec.add_development_dependency "rake" From b902d662c645b89622a4dcae44074971cb00b4ca Mon Sep 17 00:00:00 2001 From: Alexander Karmes Date: Thu, 17 Sep 2015 03:12:49 +0200 Subject: [PATCH 2/4] Set required major version of mongoid-rspec to 3 --- mongoid-enum.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongoid-enum.gemspec b/mongoid-enum.gemspec index 93498f8..8d8aacb 100644 --- a/mongoid-enum.gemspec +++ b/mongoid-enum.gemspec @@ -25,5 +25,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rspec", "~> 3.1" spec.add_development_dependency "guard-rspec", "~> 4.6.2" spec.add_development_dependency "database_cleaner", "~> 1.2.0" - spec.add_development_dependency "mongoid-rspec", "~> 2.1.0" + spec.add_development_dependency "mongoid-rspec", "~> 3.0" end From 546fc91cb16ca3cc983f399c0c4a2b55e0656a06 Mon Sep 17 00:00:00 2001 From: Alexander Karmes Date: Thu, 17 Sep 2015 03:14:03 +0200 Subject: [PATCH 3/4] Change configuration of Mongoid. By default mongoid use verbose logging, so I changed log level to :info Also mongoid config renamed "sessions" method to "cliens" and hence I renamed key in mongoid.yml --- spec/spec_helper.rb | 1 + spec/support/mongoid.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d38bba6..860b921 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -20,3 +20,4 @@ RSpec.configure do |config| end Mongoid.load!(File.expand_path("../support/mongoid.yml", __FILE__), :test) +Mongo::Logger.logger.level = ::Logger::INFO diff --git a/spec/support/mongoid.yml b/spec/support/mongoid.yml index b38aea1..46da0a1 100644 --- a/spec/support/mongoid.yml +++ b/spec/support/mongoid.yml @@ -1,5 +1,5 @@ test: - sessions: + clients: default: database: mongoid-enum_test hosts: From 589b5598a41f660b6f56ebf509e9541b639d1465 Mon Sep 17 00:00:00 2001 From: Alexander Karmes Date: Thu, 17 Sep 2015 03:16:55 +0200 Subject: [PATCH 4/4] Remove database-cleaner. - It was not able to work with mongoid 5 - I don't see the reason to use both Mongoid.purge! and DatabaseCleaner.truncate! It looks like doing double work --- mongoid-enum.gemspec | 1 - spec/spec_helper.rb | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mongoid-enum.gemspec b/mongoid-enum.gemspec index 8d8aacb..bd9465d 100644 --- a/mongoid-enum.gemspec +++ b/mongoid-enum.gemspec @@ -24,6 +24,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rake" spec.add_development_dependency "rspec", "~> 3.1" spec.add_development_dependency "guard-rspec", "~> 4.6.2" - spec.add_development_dependency "database_cleaner", "~> 1.2.0" spec.add_development_dependency "mongoid-rspec", "~> 3.0" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 860b921..6037602 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,20 +1,15 @@ $: << File.expand_path("../../lib", __FILE__) -require 'database_cleaner' require 'mongoid' -require 'mongoid-rspec' +require "mongoid/rspec" require 'mongoid/enum' ENV['MONGOID_ENV'] = "test" RSpec.configure do |config| config.include Mongoid::Matchers - config.before(:suite) do - DatabaseCleaner.strategy = :truncation - end - config.after(:each) do - DatabaseCleaner.clean + config.before(:each) do Mongoid.purge! end end