diff --git a/README.md b/README.md index 6160abd..dc03ce7 100644 --- a/README.md +++ b/README.md @@ -594,7 +594,7 @@ By default, Scimitar advertises (via things like [the `/Schemas` endpoint](https ```ruby Rails.application.config.to_prepare do - Scimitar::Engine::set_default_resources([Scimitar::Resources::User]) + Scimitar::Engine.set_default_resources([Scimitar::Resources::User]) # ...other Scimitar configuration / initialisation code... end ``` diff --git a/lib/scimitar/engine.rb b/lib/scimitar/engine.rb index ac13a08..cdac819 100644 --- a/lib/scimitar/engine.rb +++ b/lib/scimitar/engine.rb @@ -88,9 +88,9 @@ def self.set_default_resources(resource_array) unrecognised_resources = resource_array - @standard_default_resources if unrecognised_resources.any? - raise "Scimitar::Engine::set_default_resources: Only #{@standard_default_resources.map(&:name).join(', ')} are supported" + raise "Scimitar::Engine.set_default_resources: Only #{@standard_default_resources.map(&:name).join(', ')} are supported" elsif resource_array.empty? - raise 'Scimitar::Engine::set_default_resources: At least one resource must be given' + raise 'Scimitar::Engine.set_default_resources: At least one resource must be given' end @default_resources = resource_array diff --git a/spec/requests/engine_spec.rb b/spec/requests/engine_spec.rb index efac7ef..189ce8f 100644 --- a/spec/requests/engine_spec.rb +++ b/spec/requests/engine_spec.rb @@ -78,26 +78,26 @@ def self.endpoint; '/License'; end end it 'notes changes to defaults' do - Scimitar::Engine::set_default_resources([Scimitar::Resources::User]) + Scimitar::Engine.set_default_resources([Scimitar::Resources::User]) expect(Scimitar::Engine.resources()).to match_array([Scimitar::Resources::User]) end it 'notes changes to defaults with custom resources added' do - Scimitar::Engine::set_default_resources([Scimitar::Resources::User]) + Scimitar::Engine.set_default_resources([Scimitar::Resources::User]) Scimitar::Engine.add_custom_resource(@license_resource) expect(Scimitar::Engine.resources()).to match_array([Scimitar::Resources::User, @license_resource]) end it 'rejects bad defaults' do expect { - Scimitar::Engine::set_default_resources([@license_resource]) - }.to raise_error('Scimitar::Engine::set_default_resources: Only Scimitar::Resources::User, Scimitar::Resources::Group are supported') + Scimitar::Engine.set_default_resources([@license_resource]) + }.to raise_error('Scimitar::Engine.set_default_resources: Only Scimitar::Resources::User, Scimitar::Resources::Group are supported') end it 'rejects empty defaults' do expect { - Scimitar::Engine::set_default_resources([]) - }.to raise_error('Scimitar::Engine::set_default_resources: At least one resource must be given') + Scimitar::Engine.set_default_resources([]) + }.to raise_error('Scimitar::Engine.set_default_resources: At least one resource must be given') end end # "context '::resources, :add_custom_resource, ::set_default_resources' do"