Download as
Browse Code »

Commit 83c0d691cd30ff282f1fcea34c702264b7362ac0

Authored by Stephen Crosby
2 parents f1937f69 a7256287
Exists in master and in 1 other branch production

Merge pull request #951 from lucianosousa/bugfix/mongoid-rspec 

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
Gemfile
  Diff comments   View file @83c0d69
... ... @@ -8,7 +8,7 @@ gem 'actionmailer', RAILS_VERSION
8 8 gem 'actionpack', RAILS_VERSION
9 9 gem 'railties', RAILS_VERSION
10 10  
11   -gem 'mongoid', '5.0.0.beta'
  11 +gem 'mongoid', '5.0.0'
12 12 gem 'mongoid_rails_migrations'
13 13  
14 14 gem 'devise'
... ... @@ -81,7 +81,7 @@ group :test do
81 81 gem 'rspec-rails', '~> 3.0', require: false
82 82 gem 'rspec-activemodel-mocks'
83 83 gem 'rspec-its'
84   - gem 'mongoid-rspec', '~> 2.3.0.beta', require: false
  84 + gem 'mongoid-rspec', '~> 3.0.0', require: false
85 85 gem 'fabrication'
86 86 gem 'capybara'
87 87 gem 'poltergeist'
... ...
Gemfile.lock
  Diff comments   View file @83c0d69
... ... @@ -53,8 +53,8 @@ GEM
53 53 rack (>= 0.9.0)
54 54 binding_of_caller (0.7.2)
55 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 58 builder (3.2.2)
59 59 byebug (4.0.5)
60 60 columnize (= 0.9.0)
... ... @@ -185,16 +185,16 @@ GEM
185 185 mime-types (2.6.1)
186 186 mimemagic (0.3.0)
187 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 190 bson (~> 3.0)
191   - mongoid (5.0.0.beta)
  191 + mongoid (5.0.0)
192 192 activemodel (~> 4.0)
193   - mongo (= 2.1.0.beta)
  193 + mongo (~> 2.1)
194 194 origin (~> 2.1)
195 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 198 rake
199 199 rspec (~> 3.3)
200 200 mongoid_rails_migrations (1.0.1)
... ... @@ -317,15 +317,15 @@ GEM
317 317 activemodel (>= 3.0)
318 318 activesupport (>= 3.0)
319 319 rspec-mocks (>= 2.99, < 4.0)
320   - rspec-core (3.3.1)
  320 + rspec-core (3.3.2)
321 321 rspec-support (~> 3.3.0)
322   - rspec-expectations (3.3.0)
  322 + rspec-expectations (3.3.1)
323 323 diff-lcs (>= 1.2.0, < 2.0)
324 324 rspec-support (~> 3.3.0)
325 325 rspec-its (1.2.0)
326 326 rspec-core (>= 3.0.0)
327 327 rspec-expectations (>= 3.0.0)
328   - rspec-mocks (3.3.1)
  328 + rspec-mocks (3.3.2)
329 329 diff-lcs (>= 1.2.0, < 2.0)
330 330 rspec-support (~> 3.3.0)
331 331 rspec-rails (3.3.2)
... ... @@ -447,8 +447,8 @@ DEPENDENCIES
447 447 kaminari (>= 0.14.1)
448 448 launchy
449 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 452 mongoid_rails_migrations
453 453 omniauth-github
454 454 pjax_rails
... ...