Merge pull request #2046 from leonelgalan/bug_filter_parameters

Fixes bug in Test::Schema when using filter_parameters
This commit is contained in:
Benjamin Fleischer 2017-02-16 11:55:23 -06:00 committed by GitHub
commit 81a9fbd1c3
2 changed files with 4 additions and 2 deletions

View File

@ -60,11 +60,11 @@ module ActiveModelSerializers
attr_reader :document_store attr_reader :document_store
def controller_path def controller_path
request.filtered_parameters[:controller] request.filtered_parameters.with_indifferent_access[:controller]
end end
def action def action
request.filtered_parameters[:action] request.filtered_parameters.with_indifferent_access[:action]
end end
def schema_directory def schema_directory

View File

@ -6,6 +6,8 @@ module ActiveModelSerializers
config.active_support.test_order = :random config.active_support.test_order = :random
config.action_controller.perform_caching = true config.action_controller.perform_caching = true
config.action_controller.cache_store = :memory_store config.action_controller.cache_store = :memory_store
config.filter_parameters += [:password]
end end
app.routes.default_url_options = { host: 'example.com' } app.routes.default_url_options = { host: 'example.com' }