File tree Expand file tree Collapse file tree 3 files changed +10
-12
lines changed Expand file tree Collapse file tree 3 files changed +10
-12
lines changed Original file line number Diff line number Diff line change 1
1
require 'test_helper'
2
+ MongoDB . setup!
2
3
3
- Mongo . setup!
4
-
5
- if Mongo . available?
6
- Mongo . connect_to 'mongoid_articles'
4
+ if MongoDB . available?
5
+ MongoDB . connect_to 'mongoid_articles'
7
6
8
7
module Elasticsearch
9
8
module Model
Original file line number Diff line number Diff line change 6
6
7
7
::ActiveRecord ::Base . raise_in_transactional_callbacks = true if ::ActiveRecord ::Base . respond_to? ( :raise_in_transactional_callbacks ) && ::ActiveRecord ::VERSION ::MAJOR . to_s < '5'
8
8
9
- Mongo . setup!
9
+ MongoDB . setup!
10
10
11
11
module Elasticsearch
12
12
module Model
@@ -115,8 +115,8 @@ class ::Series < ActiveRecord::Base
115
115
assert_equal 0 , response . page ( 3 ) . per ( 3 ) . results . size
116
116
end
117
117
118
- if Mongo . available?
119
- Mongo . connect_to 'mongoid_collections'
118
+ if MongoDB . available?
119
+ MongoDB . connect_to 'mongoid_collections'
120
120
121
121
context "Across mongoid models" do
122
122
setup do
Original file line number Diff line number Diff line change @@ -62,14 +62,13 @@ def setup
62
62
end
63
63
end
64
64
65
- class Mongo
65
+ class MongoDB
66
66
def self . setup!
67
67
begin
68
68
require 'mongoid'
69
- session = Moped ::Connection . new ( "localhost" , 27017 , 0.5 )
70
- session . connect
69
+ Mongo ::Client . new ( [ "localhost:27017" ] )
71
70
ENV [ 'MONGODB_AVAILABLE' ] = 'yes'
72
- rescue LoadError , Moped :: Errors :: ConnectionFailure => e
71
+ rescue LoadError , Mongo :: Error => e
73
72
$stderr. puts "MongoDB not installed or running: #{ e } "
74
73
end
75
74
end
@@ -86,7 +85,7 @@ def self.connect_to(source)
86
85
logger . level = ::Logger ::DEBUG
87
86
88
87
Mongoid . logger = logger unless ENV [ 'QUIET' ]
89
- Moped . logger = logger unless ENV [ 'QUIET' ]
88
+ Mongo :: Logger . logger = logger unless ENV [ 'QUIET' ]
90
89
91
90
Mongoid . connect_to source
92
91
end
You can’t perform that action at this time.
0 commit comments