Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/mongo/operation/write/gle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ module GLE

def execute_message(context)
context.with_connection do |connection|
result_class = defined?(self.class::LegacyResult) ? self.class::LegacyResult :
defined?(self.class::Result) ? self.class::Result : Result
result_class = self.class.const_defined?(:LegacyResult, false) ? self.class::LegacyResult :
self.class.const_defined?(:Result, false) ? self.class::Result : Result
result_class.new(connection.dispatch([ message, gle ].compact)).validate!
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/mongo/operation/write/write_command_enabled.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def execute(context)
private

def execute_write_command(context)
result_class = defined?(self.class::Result) ? self.class::Result : Result
result_class = self.class.const_defined?(:Result, false) ? self.class::Result : Result
result_class.new(write_command_op.execute(context)).validate!
end
end
Expand Down
19 changes: 19 additions & 0 deletions spec/mongo/operation/result_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -272,4 +272,23 @@
end
end
end

context 'when there is a top-level Result class defined' do

before do
class Result
def get_result
Mongo::Client.new([DEFAULT_ADDRESS], TEST_OPTIONS).database.command(:ping => 1)
end
end
end

let(:result) do
Result.new.get_result
end

it 'uses the Result class of the operation' do
expect(result).to be_a(Mongo::Operation::Result)
end
end
end