Commit a7256287a6833fa126bf63e5bed129b017881d5f

Authored by Luciano Sousa
1 parent f1937f69
Exists in master and in 1 other branch production

fixing mongoid-rspec problem with bundle install and also update mongoid gem for compatibility

Showing 2 changed files with 15 additions and 15 deletions   Show diff stats
@@ -8,7 +8,7 @@ gem 'actionmailer', RAILS_VERSION @@ -8,7 +8,7 @@ gem 'actionmailer', RAILS_VERSION
8 gem 'actionpack', RAILS_VERSION 8 gem 'actionpack', RAILS_VERSION
9 gem 'railties', RAILS_VERSION 9 gem 'railties', RAILS_VERSION
10 10
11 -gem 'mongoid', '5.0.0.beta' 11 +gem 'mongoid', '5.0.0'
12 gem 'mongoid_rails_migrations' 12 gem 'mongoid_rails_migrations'
13 13
14 gem 'devise' 14 gem 'devise'
@@ -81,7 +81,7 @@ group :test do @@ -81,7 +81,7 @@ group :test do
81 gem 'rspec-rails', '~> 3.0', require: false 81 gem 'rspec-rails', '~> 3.0', require: false
82 gem 'rspec-activemodel-mocks' 82 gem 'rspec-activemodel-mocks'
83 gem 'rspec-its' 83 gem 'rspec-its'
84 - gem 'mongoid-rspec', '~> 2.3.0.beta', require: false 84 + gem 'mongoid-rspec', '~> 3.0.0', require: false
85 gem 'fabrication' 85 gem 'fabrication'
86 gem 'capybara' 86 gem 'capybara'
87 gem 'poltergeist' 87 gem 'poltergeist'
@@ -53,8 +53,8 @@ GEM @@ -53,8 +53,8 @@ GEM
53 rack (>= 0.9.0) 53 rack (>= 0.9.0)
54 binding_of_caller (0.7.2) 54 binding_of_caller (0.7.2)
55 debug_inspector (>= 0.0.1) 55 debug_inspector (>= 0.0.1)
56 - bson (3.2.0)  
57 - bson (3.2.0-java) 56 + bson (3.2.4)
  57 + bson (3.2.4-java)
58 builder (3.2.2) 58 builder (3.2.2)
59 byebug (4.0.5) 59 byebug (4.0.5)
60 columnize (= 0.9.0) 60 columnize (= 0.9.0)
@@ -185,16 +185,16 @@ GEM @@ -185,16 +185,16 @@ GEM
185 mime-types (2.6.1) 185 mime-types (2.6.1)
186 mimemagic (0.3.0) 186 mimemagic (0.3.0)
187 mini_portile (0.6.2) 187 mini_portile (0.6.2)
188 - minitest (5.8.0)  
189 - mongo (2.1.0.beta) 188 + minitest (5.8.1)
  189 + mongo (2.1.0)
190 bson (~> 3.0) 190 bson (~> 3.0)
191 - mongoid (5.0.0.beta) 191 + mongoid (5.0.0)
192 activemodel (~> 4.0) 192 activemodel (~> 4.0)
193 - mongo (= 2.1.0.beta) 193 + mongo (~> 2.1)
194 origin (~> 2.1) 194 origin (~> 2.1)
195 tzinfo (>= 0.3.37) 195 tzinfo (>= 0.3.37)
196 - mongoid-rspec (2.3.0.beta)  
197 - mongoid (= 5.0.0.beta) 196 + mongoid-rspec (3.0.0)
  197 + mongoid (~> 5.0)
198 rake 198 rake
199 rspec (~> 3.3) 199 rspec (~> 3.3)
200 mongoid_rails_migrations (1.0.1) 200 mongoid_rails_migrations (1.0.1)
@@ -317,15 +317,15 @@ GEM @@ -317,15 +317,15 @@ GEM
317 activemodel (>= 3.0) 317 activemodel (>= 3.0)
318 activesupport (>= 3.0) 318 activesupport (>= 3.0)
319 rspec-mocks (>= 2.99, < 4.0) 319 rspec-mocks (>= 2.99, < 4.0)
320 - rspec-core (3.3.1) 320 + rspec-core (3.3.2)
321 rspec-support (~> 3.3.0) 321 rspec-support (~> 3.3.0)
322 - rspec-expectations (3.3.0) 322 + rspec-expectations (3.3.1)
323 diff-lcs (>= 1.2.0, < 2.0) 323 diff-lcs (>= 1.2.0, < 2.0)
324 rspec-support (~> 3.3.0) 324 rspec-support (~> 3.3.0)
325 rspec-its (1.2.0) 325 rspec-its (1.2.0)
326 rspec-core (>= 3.0.0) 326 rspec-core (>= 3.0.0)
327 rspec-expectations (>= 3.0.0) 327 rspec-expectations (>= 3.0.0)
328 - rspec-mocks (3.3.1) 328 + rspec-mocks (3.3.2)
329 diff-lcs (>= 1.2.0, < 2.0) 329 diff-lcs (>= 1.2.0, < 2.0)
330 rspec-support (~> 3.3.0) 330 rspec-support (~> 3.3.0)
331 rspec-rails (3.3.2) 331 rspec-rails (3.3.2)
@@ -447,8 +447,8 @@ DEPENDENCIES @@ -447,8 +447,8 @@ DEPENDENCIES
447 kaminari (>= 0.14.1) 447 kaminari (>= 0.14.1)
448 launchy 448 launchy
449 meta_request 449 meta_request
450 - mongoid (= 5.0.0.beta)  
451 - mongoid-rspec (~> 2.3.0.beta) 450 + mongoid (= 5.0.0)
  451 + mongoid-rspec (~> 3.0.0)
452 mongoid_rails_migrations 452 mongoid_rails_migrations
453 omniauth-github 453 omniauth-github
454 pjax_rails 454 pjax_rails