Merge pull request RolifyCommunity#371 from lorefnon/enh/mongoid-5.0.…

…0-compat

Make specs pass for all versions of Mongoid

.travis.yml

@@ -2,10 +2,10 @@ language: ruby
 sudo: false
 
 rvm:
+  - 2.2.3
   - 2.2.2
   - 2.1.2
   - 2.0.0
-
 
 before_install:
   - gem update --system
@@ -16,7 +16,9 @@ script: bundle exec rake
 
 env:
   - ADAPTER=active_record
-  - ADAPTER=mongoid
+  - ADAPTER=mongoid MONGOID_VERSION=3
+  - ADAPTER=mongoid MONGOID_VERSION=4
+  - ADAPTER=mongoid MONGOID_VERSION=5
 
 services: mongodb
 

Gemfile

@@ -7,7 +7,14 @@ group :test do
     gem "sqlite3", :platform => "ruby"
     gem "activerecord", ">= 3.2.0", :require => "active_record"
   when "mongoid"
-    gem "mongoid", "~> 3.1"
+    case ENV["MONGOID_VERSION"]
+    when nil, '5'
+      gem "mongoid", "~> 5"
+    when '4'
+      gem "mongoid", "~> 4"
+    when '3'
+      gem "mongoid", "~> 3"
+    end
     gem "bson_ext", :platform => "ruby"
   else
     raise "Unknown model adapter: #{ENV["ADAPTER"]}"
@@ -18,6 +25,7 @@ group :test do
   gem 'byebug'
   gem 'pry-byebug'
   gem 'test-unit' # Implicitly loaded by ammeter
+  gem 'database_cleaner'
   gem 'codeclimate-test-reporter', :require => nil
 end
 

spec/generators_helper.rb

@@ -17,11 +17,12 @@
 ENV['ADAPTER'] ||= 'active_record'
 
 if ENV['ADAPTER'] == 'active_record'
+  load File.dirname(__FILE__) + '/support/adapters/utils/active_record.rb'
   require 'active_record/railtie'
-  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+  establish_connection
 else
-  require 'mongoid'
-  Mongoid.load!("spec/support/adapters/mongoid.yml", :test)
+  load File.dirname(__FILE__) + '/support/adapters/utils/mongoid.rb'
+  load_mongoid_config
 end
 
 module TestApp

spec/rolify/custom_spec.rb

@@ -17,4 +17,4 @@ def role_class
   it_behaves_like "Role.scopes"
   it_behaves_like Rolify::Dynamic
   it_behaves_like "Rolify.callbacks"
-end
+end

spec/rolify/resource_spec.rb

@@ -542,6 +542,7 @@
     context "strict user" do
       before(:all) do
         @strict_user = StrictUser.first
+        @strict_user.role_ids
         @strict_user.add_role(:forum, Forum.first)
         @strict_user.add_role(:forum, Forum)
       end

spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require "codeclimate-test-reporter"
+
 CodeClimate::TestReporter.start
 
 require 'rubygems'
@@ -11,6 +12,8 @@
   require 'its'
 rescue LoadError
 end
+require 'database_cleaner'
+
 require 'coveralls'
 Coveralls.wear_merged!
 
@@ -47,4 +50,14 @@ def silence_warnings(&block)
 
 RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.start
+  end
+
+  config.after(:suite) do |example|
+    DatabaseCleaner.clean
+  end
+
 end

spec/support/adapters/active_record.rb

@@ -1,7 +1,8 @@
-require 'active_record'
+load File.dirname(__FILE__) + '/utils/active_record.rb'
+
+extend_rspec_with_activerecord_specific_matchers
+establish_connection
 
-RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::ContainExactly)
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Base.extend Rolify
 
 load File.dirname(__FILE__) + '/../schema.rb'

spec/support/adapters/mongoid.rb

@@ -1,6 +1,11 @@
-require 'mongoid'
+load File.dirname(__FILE__) + '/utils/mongoid.rb'
 
-Mongoid.load!("spec/support/adapters/mongoid.yml", :test)
+load_mongoid_config
+
+begin
+  Mongo::Logger.logger.level = ::Logger::FATAL
+rescue NameError
+end
 
 ::Mongoid::Document.module_eval do
   def self.included(base)
@@ -13,6 +18,8 @@ def self.included(base)
 # Standard user and role classes
 class User
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
+
   rolify
 
   field :login, :type => String
@@ -21,6 +28,7 @@ class User
 # Standard user and role classes
 class StrictUser
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   rolify strict: true
 
   field :login, :type => String
@@ -48,6 +56,7 @@ class Role
 # Resourcifed and rolifed at the same time
 class HumanResource
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   resourcify :resources
   rolify
 
@@ -74,13 +83,15 @@ class HumanResource
 # Custom role and class names
 class Customer
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   rolify :role_cname => "Privilege"
 
   field :login, :type => String
 end
 
 class Privilege
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   has_and_belongs_to_many :customers
   belongs_to :resource, :polymorphic => true
   scopify
@@ -100,13 +111,15 @@ class Privilege
 module Admin
   class Moderator
     include Mongoid::Document
+    default_scope -> { order_by id: 'asc' }
     rolify :role_cname => "Admin::Right"
 
     field :login, :type => String
   end
 
   class Right
     include Mongoid::Document
+    default_scope -> { order_by id: 'asc' }
     has_and_belongs_to_many :moderators, :class_name => 'Admin::Moderator'
     belongs_to :resource, :polymorphic => true
     scopify
@@ -126,13 +139,15 @@ class Right
 # Resources classes
 class Forum
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   #resourcify done during specs setup to be able to use custom user classes
 
   field :name, :type => String
 end
 
 class Group
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   #resourcify done during specs setup to be able to use custom user classes
 
   field :name, :type => String
@@ -145,6 +160,7 @@ def subgroups
 
 class Team
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   #resourcify done during specs setup to be able to use custom user classes
 
   field :team_code, :type => Integer
@@ -153,6 +169,7 @@ class Team
 
 class Organization
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
 end
 
 class Company < Organization

spec/support/adapters/mongoid_4.yml

@@ -0,0 +1,6 @@
+test:
+  sessions:
+    default:
+      database: godfather
+      hosts:
+        - localhost:27017

spec/support/adapters/mongoid_5.yml

@@ -0,0 +1,6 @@
+test:
+  clients:
+    default:
+      database: godfather
+      hosts:
+        - localhost:27017

spec/support/adapters/utils/active_record.rb

@@ -0,0 +1,12 @@
+require 'active_record'
+
+def establish_connection
+  ActiveRecord::Base.establish_connection(
+    :adapter => "sqlite3",
+    :database => ":memory:"
+  )
+end
+
+def extend_rspec_with_activerecord_specific_matchers
+  RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::ContainExactly)
+end

spec/support/adapters/utils/mongoid.rb

@@ -0,0 +1,13 @@
+require 'mongoid'
+
+def mongoid_major_version
+  Mongoid::VERSION.split('.').first.to_i
+end
+
+def mongoid_config
+  "spec/support/adapters/mongoid_#{mongoid_major_version}.yml"
+end
+
+def load_mongoid_config
+  Mongoid.load!(mongoid_config, :test)
+end