From 3ebce550fe7b60c5de966eec1efd9d585910e57e Mon Sep 17 00:00:00 2001 From: Daniel Waterworth Date: Mon, 6 Dec 2021 09:10:14 -0600 Subject: [PATCH] DEV: Make add_api_parameter_route parameter deprecations errors (#15198) Since we said we would remove support in 2.7, this is overdue. --- lib/plugin/instance.rb | 4 ++-- spec/integration/api_keys_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb index 71b92a42de0..902aaa4a00b 100644 --- a/lib/plugin/instance.rb +++ b/lib/plugin/instance.rb @@ -907,14 +907,14 @@ class Plugin::Instance format: nil, formats: nil) if Array(format).include?("*") - Discourse.deprecate("* is no longer a valid api_parameter_route format matcher. Use `nil` instead", drop_from: "2.7") + Discourse.deprecate("* is no longer a valid api_parameter_route format matcher. Use `nil` instead", drop_from: "2.7", raise_error: true) # Old API used * as wildcard. New api uses `nil` format = nil end # Backwards compatibility with old parameter names: if method || route || format - Discourse.deprecate("method, route and format parameters for api_parameter_routes are deprecated. Use methods, actions and formats instead.", drop_from: "2.7") + Discourse.deprecate("method, route and format parameters for api_parameter_routes are deprecated. Use methods, actions and formats instead.", drop_from: "2.7", raise_error: true) methods ||= method actions ||= route formats ||= format diff --git a/spec/integration/api_keys_spec.rb b/spec/integration/api_keys_spec.rb index 60598cfbcfe..39b6ffb3ff0 100644 --- a/spec/integration/api_keys_spec.rb +++ b/spec/integration/api_keys_spec.rb @@ -51,7 +51,7 @@ describe 'api keys' do context "with a plugin registered filter" do before do plugin = Plugin::Instance.new - plugin.add_api_parameter_route method: :get, route: "session#current", format: "*" + plugin.add_api_parameter_route methods: [:get], actions: ["session#current"] end it 'allows parameter access to the registered route' do