Skip to content

Commit

Permalink
Address #133 (comment)
Browse files Browse the repository at this point in the history
  • Loading branch information
pond committed Jul 8, 2024
1 parent 381aaf3 commit 782c039
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
4 changes: 2 additions & 2 deletions lib/scimitar/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions spec/requests/engine_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 782c039

Please sign in to comment.