From b998837592ed56f78a7831b655fae6268c57501e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Thu, 11 May 2017 19:03:50 -0700 Subject: [PATCH] Test with mongoid --- .travis.yml | 4 ---- Gemfile | 7 +++---- Gemfile.lock | 7 +++++++ gemfiles/Gemfile.rails-5.0-stable | 7 +++---- gemfiles/Gemfile.rails-5.0-stable.lock | 7 +++++++ 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index feeb80b1..7559091f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,10 +25,6 @@ matrix: gemfile: gemfiles/Gemfile.rails-5.0-stable - rvm: 2.1.10 gemfile: Gemfile - - env: DEVISE_ORM=mongoid - gemfile: Gemfile - - env: DEVISE_ORM=mongoid - gemfile: gemfiles/Gemfile.rails-5.0-stable allow_failures: - rvm: ruby-head services: diff --git a/Gemfile b/Gemfile index dc7b6b4a..27d2fae3 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,6 @@ platforms :ruby do gem "sqlite3" end -# TODO: -# group :mongoid do -# gem "mongoid", "~> 4.0.0" -# end +group :mongoid do + gem "mongoid" +end diff --git a/Gemfile.lock b/Gemfile.lock index 9b012392..75ea2f17 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,6 +59,7 @@ GEM tzinfo (~> 1.1) arel (8.0.0) bcrypt (3.1.11) + bson (4.2.1) builder (3.2.3) concurrent-ruby (1.0.5) erubi (1.6.0) @@ -82,6 +83,11 @@ GEM minitest (5.10.1) mocha (1.2.1) metaclass (~> 0.0.1) + mongo (2.4.1) + bson (>= 4.2.1, < 5.0.0) + mongoid (6.1.0) + activemodel (~> 5.0) + mongo (>= 2.4.1, < 3.0.0) multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -178,6 +184,7 @@ DEPENDENCIES jruby-openssl minitest (< 5.10.2) mocha (~> 1.1) + mongoid oauth2 omniauth (~> 1.3) omniauth-facebook diff --git a/gemfiles/Gemfile.rails-5.0-stable b/gemfiles/Gemfile.rails-5.0-stable index f4acf8ac..67d410db 100644 --- a/gemfiles/Gemfile.rails-5.0-stable +++ b/gemfiles/Gemfile.rails-5.0-stable @@ -28,7 +28,6 @@ platforms :ruby do gem "sqlite3" end -# TODO: -# group :mongoid do -# gem "mongoid", "~> 4.0.0" -# end +group :mongoid do + gem "mongoid" +end diff --git a/gemfiles/Gemfile.rails-5.0-stable.lock b/gemfiles/Gemfile.rails-5.0-stable.lock index cd933176..09316464 100644 --- a/gemfiles/Gemfile.rails-5.0-stable.lock +++ b/gemfiles/Gemfile.rails-5.0-stable.lock @@ -59,6 +59,7 @@ GEM tzinfo (~> 1.1) arel (7.1.4) bcrypt (3.1.11) + bson (4.2.1) builder (3.2.3) concurrent-ruby (1.0.5) erubis (2.7.0) @@ -82,6 +83,11 @@ GEM minitest (5.10.1) mocha (1.2.1) metaclass (~> 0.0.1) + mongo (2.4.1) + bson (>= 4.2.1, < 5.0.0) + mongoid (6.1.0) + activemodel (~> 5.0) + mongo (>= 2.4.1, < 3.0.0) multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -177,6 +183,7 @@ DEPENDENCIES devise! minitest (< 5.10.2) mocha (~> 1.1) + mongoid omniauth omniauth-facebook omniauth-oauth2