Skip to content
Open
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
3 changes: 2 additions & 1 deletion lib/gruf/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ def clear_interceptors
# @return [Array<Class>]
#
def services
@services ||= ::Gruf.services || (options.fetch(:services, nil) || [])
global_services = ::Gruf.services
@services ||= global_services&.any? ? global_services : options.fetch(:services, [])
end

##
Expand Down
24 changes: 24 additions & 0 deletions spec/gruf/server_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,30 @@
end
end

describe '#services' do
subject { gruf_server.send(:services) }

let(:options) { { services: [Rpc::ThingService::Service] } }

context 'when no global services are configured' do
it 'uses services passed to the server' do
expect(subject).to eq options[:services]
end
end

context 'when global services are configured' do
let(:global_services) { [Rpc::Test::Service1::Service] }

before do
Gruf.services = global_services
end

it 'uses global services instead of services passed to the server' do
expect(subject).to eq global_services
end
end
end

describe '#add_service' do
subject { gruf_server.add_service(service) }

Expand Down