Skip to content

Commit 931830c

Browse files
committed
[CI] Update references to MongoDB Ruby driver (#807)
1 parent 8d79b98 commit 931830c

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

elasticsearch-model/test/integration/mongoid_basic_test.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
require 'test_helper'
2+
MongoDB.setup!
23

3-
Mongo.setup!
4-
5-
if Mongo.available?
6-
Mongo.connect_to 'mongoid_articles'
4+
if MongoDB.available?
5+
MongoDB.connect_to 'mongoid_articles'
76

87
module Elasticsearch
98
module Model

elasticsearch-model/test/integration/multiple_models_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
88

9-
Mongo.setup!
9+
MongoDB.setup!
1010

1111
module Elasticsearch
1212
module Model
@@ -115,8 +115,8 @@ class ::Series < ActiveRecord::Base
115115
assert_equal 0, response.page(3).per(3).results.size
116116
end
117117

118-
if Mongo.available?
119-
Mongo.connect_to 'mongoid_collections'
118+
if MongoDB.available?
119+
MongoDB.connect_to 'mongoid_collections'
120120

121121
context "Across mongoid models" do
122122
setup do

elasticsearch-model/test/test_helper.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,13 @@ def setup
6262
end
6363
end
6464

65-
class Mongo
65+
class MongoDB
6666
def self.setup!
6767
begin
6868
require 'mongoid'
69-
session = Moped::Connection.new("localhost", 27017, 0.5)
70-
session.connect
69+
Mongo::Client.new(["localhost:27017"])
7170
ENV['MONGODB_AVAILABLE'] = 'yes'
72-
rescue LoadError, Moped::Errors::ConnectionFailure => e
71+
rescue LoadError, Mongo::Error => e
7372
$stderr.puts "MongoDB not installed or running: #{e}"
7473
end
7574
end
@@ -86,7 +85,7 @@ def self.connect_to(source)
8685
logger.level = ::Logger::DEBUG
8786

8887
Mongoid.logger = logger unless ENV['QUIET']
89-
Moped.logger = logger unless ENV['QUIET']
88+
Mongo::Logger.logger = logger unless ENV['QUIET']
9089

9190
Mongoid.connect_to source
9291
end

0 commit comments

Comments
 (0)