Upgrade Mongoid to 5.0

heartcombo · Apr 19, 2016 · 9696d83 · 9696d83
1 parent 940ca4f
commit 9696d83
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -25,5 +25,5 @@ platforms :ruby do
 end
 
 group :mongoid do
-  gem "mongoid", "~> 4.0"
+  gem "mongoid", "~> 5.0"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -48,10 +48,10 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     bcrypt (3.1.11)
-    bson (3.2.6)
     builder (3.2.2)
     concurrent-ruby (1.0.1)
     connection_pool (2.2.0)
+    bson (4.0.0)
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -71,15 +71,13 @@ GEM
     minitest (5.8.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    mongoid (4.0.2)
+    mongo (2.2.0)
+      bson (~> 4.0)
+    mongoid (5.0.1)
       activemodel (~> 4.0)
-      moped (~> 2.0.0)
+      mongo (~> 2.1)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.7)
-      bson (~> 3.0)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -169,8 +167,8 @@ DEPENDENCIES
   devise!
   jruby-openssl
   mocha (~> 1.1)
-  mongoid (~> 4.0)
   omniauth (~> 1.3)
+  mongoid (~> 5.0)
   omniauth-facebook
   omniauth-oauth2 (~> 1.4)
   omniauth-openid (~> 1.0.1)

diff --git a/test/support/mongoid.yml b/test/support/mongoid.yml
@@ -1,5 +1,5 @@
 test:
-  sessions:
+  <%= Mongoid::VERSION.to_i > 4 ? 'clients' : 'sessions' %>:
     default:
       database: devise-test-suite
       hosts: