From 47c945b101a01bf438024ede594b3a039c4eca66 Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 21 Mar 2017 10:19:08 +0100 Subject: fix: 404 on key request with non html content-type --- test/functional/keys_controller_test.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/functional/keys_controller_test.rb b/test/functional/keys_controller_test.rb index f5e2691..1d437e7 100644 --- a/test/functional/keys_controller_test.rb +++ b/test/functional/keys_controller_test.rb @@ -3,7 +3,10 @@ require 'test_helper' class KeysControllerTest < ActionController::TestCase test "get key for username with dot" do - assert_recognizes({controller: 'keys', action: 'show', login: 'username.with.dot'}, 'key/username.with.dot') + assert_routing 'key/username.with.dot', controller: 'keys', + action: 'show', + login: 'username.with.dot', + format: :text end test "get existing public key" do @@ -27,10 +30,9 @@ class KeysControllerTest < ActionController::TestCase end test "get public key for non-existing user" do - # raise 404 error if user doesn't exist (doesn't need to be this routing error, but seems fine to assume for now): - assert_raise(ActionController::RoutingError) { - get :show, :login => 'asdkljslksjfdlskfj' - } + # raise 404 error if user doesn't exist + get :show, :login => 'asdkljslksjfdlskfj' + assert_response :not_found end end -- cgit v1.2.3