Skip to content

Commit db8ddd0

Browse files
committed
minor: silence some warning due to deprecaton
1 parent 9e223f4 commit db8ddd0

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

lib/mongo/collection.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def insert(doc_or_docs, options={})
260260
# run the operation in safe mode, which run a getlasterror command on the
261261
# database to report any assertion. In addition, a hash can be provided to
262262
# run an fsync and/or wait for replication of the remove (>= 1.5.1). See the options
263-
# for DB#error.
263+
# for DB#get_last_error.
264264
#
265265
# @example remove all documents from the 'users' collection:
266266
# users.remove

lib/mongo/connection.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ def send_message(operation, message, log_message=nil)
398398
# @param [Hash] last_error_params parameters to be sent to getLastError. See DB#error for
399399
# available options.
400400
#
401-
# @see DB#error for valid last error params.
401+
# @see DB#get_last_error for valid last error params.
402402
#
403403
# @return [Array]
404404
# An array whose indexes include [0] documents returned, [1] number of document received,

test/collection_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'test/test_helper'
1+
require './test/test_helper'
22

33
class TestCollection < Test::Unit::TestCase
44
@@connection ||= Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost', ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)

test/connection_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def setup
1515
end
1616

1717
def teardown
18-
@mongo.db(MONGO_TEST_DB).error
18+
@mongo[MONGO_TEST_DB].get_last_error
1919
end
2020

2121
def test_slave_ok_with_multiple_nodes

test/db_api_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def setup
1919

2020
def teardown
2121
@@coll.remove
22-
@@db.error
22+
@@db.get_last_error
2323
end
2424

2525
def test_clear

test/db_test.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,30 +164,30 @@ def test_command
164164

165165
def test_error
166166
@@db.reset_error_history
167-
assert_nil @@db.error
167+
assert_nil @@db.get_last_error['err']
168168
assert !@@db.error?
169169
assert_nil @@db.previous_error
170170

171171
@@db.command({:forceerror => 1}, :check_response => false)
172172
assert @@db.error?
173-
assert_not_nil @@db.error
173+
assert_not_nil @@db.get_last_error['err']
174174
assert_not_nil @@db.previous_error
175175

176176
@@db.command({:forceerror => 1}, :check_response => false)
177177
assert @@db.error?
178-
assert @@db.error
178+
assert @@db.get_last_error['err']
179179
prev_error = @@db.previous_error
180180
assert_equal 1, prev_error['nPrev']
181-
assert_equal prev_error["err"], @@db.error
181+
assert_equal prev_error["err"], @@db.get_last_error['err']
182182

183183
@@db.collection('test').find_one
184-
assert_nil @@db.error
184+
assert_nil @@db.get_last_error['err']
185185
assert !@@db.error?
186186
assert @@db.previous_error
187187
assert_equal 2, @@db.previous_error['nPrev']
188188

189189
@@db.reset_error_history
190-
assert_nil @@db.error
190+
assert_nil @@db.get_last_error['err']
191191
assert !@@db.error?
192192
assert_nil @@db.previous_error
193193
end

0 commit comments

Comments
 (0)