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
1 change: 1 addition & 0 deletions lib/has_scope.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def has_scope(*scopes, &block)

options[:only] = Array(options[:only])
options[:except] = Array(options[:except])
options[:block] = block if block

self.scopes_configuration = scopes_configuration.dup

Expand Down
8 changes: 8 additions & 0 deletions test/has_scope_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ def default_render

class BonsaisController < TreesController
has_scope :categories, if: :categories?
has_scope :content do |controller, scope|
scope.by_content('some other content')
end

protected
def categories?
Expand Down Expand Up @@ -483,6 +486,11 @@ def test_overwritten_scope
assert_equal(:categories?, BonsaisController.scopes_configuration[:categories][:if])
end

def test_overwritten_scope_with_block
assert_nil(TreesController.scopes_configuration[:content][:block])
assert(BonsaisController.scopes_configuration[:content][:block])
end

protected

def mock_tree(stubs = {})
Expand Down