Bump mongoid

Author: grzegorz-jakubiak

Gemfile.lock

@@ -11,7 +11,7 @@ PATH
       activeadmin (>= 1.4.3)
       jquery-rails
       kaminari-mongoid
-      mongoid (~> 6.0)
+      mongoid (>= 6.0, <= 7.0)
       sass-rails (>= 3.1.4)
 
 GEM
@@ -40,18 +40,17 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activeadmin (1.4.3)
-      arbre (>= 1.1.1)
-      coffee-rails
+    activeadmin (2.6.0)
+      arbre (~> 1.2, >= 1.2.1)
       formtastic (~> 3.1)
-      formtastic_i18n
-      inherited_resources (>= 1.9.0)
-      jquery-rails (>= 4.2.0)
-      kaminari (>= 0.15)
-      railties (>= 4.2, < 5.3)
-      ransack (>= 1.8.7)
-      sass (~> 3.1)
-      sprockets (< 4.1)
+      formtastic_i18n (~> 0.4)
+      inherited_resources (~> 1.7)
+      jquery-rails (~> 4.2)
+      kaminari (~> 1.0, >= 1.0.1)
+      railties (>= 5.2, < 6.1)
+      ransack (~> 2.1, >= 2.1.1)
+      sassc-rails (~> 2.1)
+      sprockets (>= 3.0, < 4.1)
     activejob (5.2.3)
       activesupport (= 5.2.3)
       globalid (>= 0.3.6)
@@ -76,7 +75,7 @@ GEM
       activesupport (>= 3.0.0)
     arel (9.0.0)
     bcrypt (3.1.13)
-    bson (4.4.2)
+    bson (4.7.1)
     builder (3.2.3)
     capybara (3.12.0)
       addressable
@@ -88,13 +87,6 @@ GEM
       xpath (~> 3.2)
     cliver (0.3.2)
     coderay (1.1.2)
-    coffee-rails (4.2.2)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     concurrent-ruby (1.1.5)
     crass (1.0.5)
     devise (4.7.1)
@@ -106,8 +98,7 @@ GEM
     diff-lcs (1.3)
     docile (1.3.1)
     erubi (1.8.0)
-    execjs (2.7.0)
-    ffi (1.10.0)
+    ffi (1.12.1)
     formtastic (3.1.5)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.6.0)
@@ -118,11 +109,11 @@ GEM
       activesupport (>= 4.1)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    inherited_resources (1.10.0)
-      actionpack (>= 5.0, < 6.0)
+    inherited_resources (1.11.0)
+      actionpack (>= 5.0, < 6.1)
       has_scope (~> 0.6)
-      railties (>= 5.0, < 6.0)
-      responders (~> 2.0)
+      railties (>= 5.0, < 6.1)
+      responders (>= 2, < 4)
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -161,9 +152,9 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    mongo (2.8.0)
+    mongo (2.11.3)
       bson (>= 4.4.2, < 5.0.0)
-    mongoid (6.4.2)
+    mongoid (7.0.0)
       activemodel (>= 5.1, < 6.0.0)
       mongo (>= 2.5.1, < 3.0.0)
     nio4r (2.3.1)
@@ -174,6 +165,8 @@ GEM
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
+    polyamorous (2.3.2)
+      activerecord (>= 5.2.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -208,14 +201,11 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (12.3.3)
-    ransack (2.1.1)
-      actionpack (>= 5.0)
-      activerecord (>= 5.0)
-      activesupport (>= 5.0)
+    ransack (2.3.2)
+      activerecord (>= 5.2.1)
+      activesupport (>= 5.2.1)
       i18n
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
+      polyamorous (= 2.3.2)
     regexp_parser (1.3.0)
     responders (2.4.1)
       actionpack (>= 4.2.0, < 6.0)
@@ -237,17 +227,16 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -262,7 +251,7 @@ GEM
       sprockets (>= 3.0.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     warden (1.2.8)

activeadmin-mongoid.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.4'
 
-  gem.add_runtime_dependency 'mongoid',     ['~> 6.0']
+  gem.add_runtime_dependency 'mongoid',     '>= 6.0', '<= 7.0'
   gem.add_runtime_dependency 'activeadmin', '>= 1.4.3'
   gem.add_runtime_dependency 'kaminari-mongoid'
   gem.add_runtime_dependency 'jquery-rails'

test_app/config/mongoid.6.yml

@@ -1,10 +1,3 @@
-development:
-  clients:
-    default:
-      database: activeadmin_mongoid_development
-      hosts:
-        - localhost:27017
-
 test:
   clients:
     default:

test_app/config/mongoid7.yml

@@ -0,0 +1,14 @@
+development:
+  clients:
+    default:
+      database: activeadmin_mongoid_development
+      hosts:
+        - localhost:27017
+
+test:
+  clients:
+    default:
+      database: activeadmin_mongoid_test
+      hosts:
+        - localhost:27017
+#scope_overwrite_exception: true