Merge pull request #11045 from dmarcoux/refactor_trigger_webhooks_con…

…trollers-fix_minitest_tests Fix Minitest tests related to trigger_controller
openSUSE · Apr 26, 2021 · afee6fd · afee6fd
2 parents bdbc3c1 + 6fcf612
commit afee6fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/api/app/controllers/trigger_controller.rb b/src/api/app/controllers/trigger_controller.rb
@@ -15,7 +15,7 @@ class TriggerController < ApplicationController
   def create
     authorize @token
     @token.user.run_as do
-      @token.call(params.slice(:repository, :arch))
+      @token.call(params.slice(:repository, :arch).permit!)
       render_ok
     end
   end

diff --git a/src/api/test/functional/source_services_test.rb b/src/api/test/functional/source_services_test.rb
@@ -597,12 +597,12 @@ def test_run_service_via_token
     post '/trigger/runservice', headers: { 'Authorization' => "Token #{token}" }
     # success, but no source service configured :)
     assert_response 403
-    assert_xml_tag tag: 'status', attributes: { code: 'no_permission_for_inactive' }
+    assert_xml_tag tag: 'status', attributes: { code: 'create_token/service_not_authorized' }
     # with global token
     post '/trigger/runservice?project=home:tom&package=service', headers: { 'Authorization' => "Token #{alltoken}" }
     # success, but no source service configured :)
     assert_response 403
-    assert_xml_tag tag: 'status', attributes: { code: 'no_permission_for_inactive' }
+    assert_xml_tag tag: 'status', attributes: { code: 'create_token/service_not_authorized' }
 
     # reset and drop stuff as tom
     tom.state = 'confirmed'