From 4d221fd7a6f2914cd7403a19d0f507a8e43ba5c6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 3 Sep 2024 18:54:05 +0100 Subject: [PATCH] Simplify creation of bearer authorization headers Uses the new features added to the bearer_authorization_header while dropping basic authentication support to simplify the creation of bearer authorization headers for API tests. --- .../api/changeset_comments_controller_test.rb | 6 +- .../api/messages_controller_test.rb | 78 ++++--------------- .../api/old_nodes_controller_test.rb | 19 ++--- .../api/old_relations_controller_test.rb | 19 ++--- .../api/old_ways_controller_test.rb | 19 ++--- .../api/permissions_controller_test.rb | 6 +- .../api/user_preferences_controller_test.rb | 8 +- test/controllers/api/users_controller_test.rb | 69 +++++++--------- 8 files changed, 72 insertions(+), 152 deletions(-) diff --git a/test/controllers/api/changeset_comments_controller_test.rb b/test/controllers/api/changeset_comments_controller_test.rb index ca7fc3407..35e45e8c8 100644 --- a/test/controllers/api/changeset_comments_controller_test.rb +++ b/test/controllers/api/changeset_comments_controller_test.rb @@ -303,11 +303,11 @@ module Api # But writing oauth tests is hard, and so it's easier to put in a controller test.) def test_api_write_and_terms_agreed_via_token user = create(:user, :terms_agreed => nil) - token = create(:oauth_access_token, :resource_owner_id => user.id, :scopes => %w[write_api]) + auth_header = bearer_authorization_header(user, :scopes => %w[write_api]) changeset = create(:changeset, :closed) assert_difference "ChangesetComment.count", 0 do - post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => bearer_authorization_header(token.token) + post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => auth_header end assert_response :forbidden @@ -316,7 +316,7 @@ module Api user.save! assert_difference "ChangesetComment.count", 1 do - post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => bearer_authorization_header(token.token) + post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => auth_header end assert_response :success end diff --git a/test/controllers/api/messages_controller_test.rb b/test/controllers/api/messages_controller_test.rb index 0b54be4dc..cbf8dc870 100644 --- a/test/controllers/api/messages_controller_test.rb +++ b/test/controllers/api/messages_controller_test.rb @@ -59,10 +59,7 @@ module Api recipient = create(:user) sender = create(:user) - sender_token = create(:oauth_access_token, - :resource_owner_id => sender.id, - :scopes => %w[send_messages consume_messages]) - sender_auth = bearer_authorization_header(sender_token.token) + sender_auth = bearer_authorization_header(sender, :scopes => %w[send_messages consume_messages]) msg = build(:message) @@ -101,10 +98,7 @@ module Api recipient = create(:user) sender = create(:user) - sender_token = create(:oauth_access_token, - :resource_owner_id => sender.id, - :scopes => %w[send_messages consume_messages]) - sender_auth = bearer_authorization_header(sender_token.token) + sender_auth = bearer_authorization_header(sender, :scopes => %w[send_messages consume_messages]) assert_no_difference "Message.count" do assert_no_difference "ActionMailer::Base.deliveries.size" do @@ -160,20 +154,9 @@ module Api sender = create(:user) user3 = create(:user) - sender_token = create(:oauth_access_token, - :resource_owner_id => sender.id, - :scopes => %w[consume_messages]) - sender_auth = bearer_authorization_header(sender_token.token) - - recipient_token = create(:oauth_access_token, - :resource_owner_id => recipient.id, - :scopes => %w[consume_messages]) - recipient_auth = bearer_authorization_header(recipient_token.token) - - user3_token = create(:oauth_access_token, - :resource_owner_id => user3.id, - :scopes => %w[send_messages consume_messages]) - user3_auth = bearer_authorization_header(user3_token.token) + sender_auth = bearer_authorization_header(sender, :scopes => %w[consume_messages]) + recipient_auth = bearer_authorization_header(recipient, :scopes => %w[consume_messages]) + user3_auth = bearer_authorization_header(user3, :scopes => %w[send_messages consume_messages]) msg = create(:message, :unread, :sender => sender, :recipient => recipient) @@ -264,15 +247,8 @@ module Api sender = create(:user) user3 = create(:user) - recipient_token = create(:oauth_access_token, - :resource_owner_id => recipient.id, - :scopes => %w[consume_messages]) - recipient_auth = bearer_authorization_header(recipient_token.token) - - user3_token = create(:oauth_access_token, - :resource_owner_id => user3.id, - :scopes => %w[send_messages consume_messages]) - user3_auth = bearer_authorization_header(user3_token.token) + recipient_auth = bearer_authorization_header(recipient, :scopes => %w[consume_messages]) + user3_auth = bearer_authorization_header(user3, :scopes => %w[send_messages consume_messages]) msg = create(:message, :unread, :sender => sender, :recipient => recipient) @@ -339,22 +315,13 @@ module Api def test_delete recipient = create(:user) - recipient_token = create(:oauth_access_token, - :resource_owner_id => recipient.id, - :scopes => %w[consume_messages]) - recipient_auth = bearer_authorization_header(recipient_token.token) + recipient_auth = bearer_authorization_header(recipient, :scopes => %w[consume_messages]) sender = create(:user) - sender_token = create(:oauth_access_token, - :resource_owner_id => sender.id, - :scopes => %w[send_messages consume_messages]) - sender_auth = bearer_authorization_header(sender_token.token) + sender_auth = bearer_authorization_header(sender, :scopes => %w[send_messages consume_messages]) user3 = create(:user) - user3_token = create(:oauth_access_token, - :resource_owner_id => user3.id, - :scopes => %w[send_messages consume_messages]) - user3_auth = bearer_authorization_header(user3_token.token) + user3_auth = bearer_authorization_header(user3, :scopes => %w[send_messages consume_messages]) msg = create(:message, :read, :sender => sender, :recipient => recipient) @@ -407,22 +374,13 @@ module Api def test_list_messages user1 = create(:user) - user1_token = create(:oauth_access_token, - :resource_owner_id => user1.id, - :scopes => %w[send_messages consume_messages]) - user1_auth = bearer_authorization_header(user1_token.token) + user1_auth = bearer_authorization_header(user1, :scopes => %w[send_messages consume_messages]) user2 = create(:user) - user2_token = create(:oauth_access_token, - :resource_owner_id => user2.id, - :scopes => %w[send_messages consume_messages]) - user2_auth = bearer_authorization_header(user2_token.token) + user2_auth = bearer_authorization_header(user2, :scopes => %w[send_messages consume_messages]) user3 = create(:user) - user3_token = create(:oauth_access_token, - :resource_owner_id => user3.id, - :scopes => %w[send_messages consume_messages]) - user3_auth = bearer_authorization_header(user3_token.token) + user3_auth = bearer_authorization_header(user3, :scopes => %w[send_messages consume_messages]) # create some messages between users # user | inbox | outbox @@ -523,10 +481,7 @@ module Api def test_paged_list_messages_asc recipient = create(:user) - recipient_token = create(:oauth_access_token, - :resource_owner_id => recipient.id, - :scopes => %w[consume_messages]) - recipient_auth = bearer_authorization_header(recipient_token.token) + recipient_auth = bearer_authorization_header(recipient, :scopes => %w[consume_messages]) sender = create(:user) @@ -559,10 +514,7 @@ module Api def test_paged_list_messages_desc recipient = create(:user) - recipient_token = create(:oauth_access_token, - :resource_owner_id => recipient.id, - :scopes => %w[consume_messages]) - recipient_auth = bearer_authorization_header(recipient_token.token) + recipient_auth = bearer_authorization_header(recipient, :scopes => %w[consume_messages]) sender = create(:user) diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index 99c4dbb1b..64325fd28 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -239,38 +239,38 @@ module Api end def test_redact_node_by_regular_with_read_prefs_scope - auth_header = create_bearer_auth_header(create(:user), %w[read_prefs]) + auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs]) do_redact_redactable_node(auth_header) assert_response :forbidden, "should need to be moderator to redact." end def test_redact_node_by_regular_with_write_api_scope - auth_header = create_bearer_auth_header(create(:user), %w[write_api]) + auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_api]) do_redact_redactable_node(auth_header) assert_response :forbidden, "should need to be moderator to redact." end def test_redact_node_by_regular_with_write_redactions_scope - auth_header = create_bearer_auth_header(create(:user), %w[write_redactions]) + auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions]) do_redact_redactable_node(auth_header) assert_response :forbidden, "should need to be moderator to redact." end def test_redact_node_by_moderator_with_read_prefs_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[read_prefs]) + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs]) do_redact_redactable_node(auth_header) assert_response :forbidden, "should need to have write_redactions scope to redact." end def test_redact_node_by_moderator_with_write_api_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_api]) + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_api]) do_redact_redactable_node(auth_header) assert_response :success, "should be OK to redact old version as moderator with write_api scope." # assert_response :forbidden, "should need to have write_redactions scope to redact." end def test_redact_node_by_moderator_with_write_redactions_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_redactions]) + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions]) do_redact_redactable_node(auth_header) assert_response :success, "should be OK to redact old version as moderator with write_redactions scope." end @@ -432,13 +432,6 @@ module Api private - def create_bearer_auth_header(user, scopes) - token = create(:oauth_access_token, - :resource_owner_id => user.id, - :scopes => scopes) - bearer_authorization_header(token.token) - end - def do_redact_redactable_node(headers = {}) node = create(:node, :with_history, :version => 4) node_v3 = node.old_nodes.find_by(:version => 3) diff --git a/test/controllers/api/old_relations_controller_test.rb b/test/controllers/api/old_relations_controller_test.rb index 446fb5f14..8d750542f 100644 --- a/test/controllers/api/old_relations_controller_test.rb +++ b/test/controllers/api/old_relations_controller_test.rb @@ -78,38 +78,38 @@ module Api end def test_redact_relation_by_regular_with_read_prefs_scope - auth_header = create_bearer_auth_header(create(:user), %w[read_prefs]) + auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs]) do_redact_redactable_relation(auth_header) assert_response :forbidden, "should need to be moderator to redact." end def test_redact_relation_by_regular_with_write_api_scope - auth_header = create_bearer_auth_header(create(:user), %w[write_api]) + auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_api]) do_redact_redactable_relation(auth_header) assert_response :forbidden, "should need to be moderator to redact." end def test_redact_relation_by_regular_with_write_redactions_scope - auth_header = create_bearer_auth_header(create(:user), %w[write_redactions]) + auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions]) do_redact_redactable_relation(auth_header) assert_response :forbidden, "should need to be moderator to redact." end def test_redact_relation_by_moderator_with_read_prefs_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[read_prefs]) + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs]) do_redact_redactable_relation(auth_header) assert_response :forbidden, "should need to have write_redactions scope to redact." end def test_redact_relation_by_moderator_with_write_api_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_api]) + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_api]) do_redact_redactable_relation(auth_header) assert_response :success, "should be OK to redact old version as moderator with write_api scope." # assert_response :forbidden, "should need to have write_redactions scope to redact." end def test_redact_relation_by_moderator_with_write_redactions_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_redactions]) + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions]) do_redact_redactable_relation(auth_header) assert_response :success, "should be OK to redact old version as moderator with write_redactions scope." end @@ -315,13 +315,6 @@ module Api end end - def create_bearer_auth_header(user, scopes) - token = create(:oauth_access_token, - :resource_owner_id => user.id, - :scopes => scopes) - bearer_authorization_header(token.token) - end - def do_redact_redactable_relation(headers = {}) relation = create(:relation, :with_history, :version => 4) relation_v3 = relation.old_relations.find_by(:version => 3) diff --git a/test/controllers/api/old_ways_controller_test.rb b/test/controllers/api/old_ways_controller_test.rb index 482655754..c6596ec34 100644 --- a/test/controllers/api/old_ways_controller_test.rb +++ b/test/controllers/api/old_ways_controller_test.rb @@ -119,38 +119,38 @@ module Api end def test_redact_way_by_regular_with_read_prefs_scope - auth_header = create_bearer_auth_header(create(:user), %w[read_prefs]) + auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs]) do_redact_redactable_way(auth_header) assert_response :forbidden, "should need to be moderator to redact." end def test_redact_way_by_regular_with_write_api_scope - auth_header = create_bearer_auth_header(create(:user), %w[write_api]) + auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_api]) do_redact_redactable_way(auth_header) assert_response :forbidden, "should need to be moderator to redact." end def test_redact_way_by_regular_with_write_redactions_scope - auth_header = create_bearer_auth_header(create(:user), %w[write_redactions]) + auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions]) do_redact_redactable_way(auth_header) assert_response :forbidden, "should need to be moderator to redact." end def test_redact_way_by_moderator_with_read_prefs_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[read_prefs]) + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs]) do_redact_redactable_way(auth_header) assert_response :forbidden, "should need to have write_redactions scope to redact." end def test_redact_way_by_moderator_with_write_api_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_api]) + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_api]) do_redact_redactable_way(auth_header) assert_response :success, "should be OK to redact old version as moderator with write_api scope." # assert_response :forbidden, "should need to have write_redactions scope to redact." end def test_redact_way_by_moderator_with_write_redactions_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_redactions]) + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions]) do_redact_redactable_way(auth_header) assert_response :success, "should be OK to redact old version as moderator with write_redactions scope." end @@ -354,13 +354,6 @@ module Api end end - def create_bearer_auth_header(user, scopes) - token = create(:oauth_access_token, - :resource_owner_id => user.id, - :scopes => scopes) - bearer_authorization_header(token.token) - end - def do_redact_redactable_way(headers = {}) way = create(:way, :with_history, :version => 4) way_v3 = way.old_ways.find_by(:version => 3) diff --git a/test/controllers/api/permissions_controller_test.rb b/test/controllers/api/permissions_controller_test.rb index 1ee3365e7..2a7ac5e12 100644 --- a/test/controllers/api/permissions_controller_test.rb +++ b/test/controllers/api/permissions_controller_test.rb @@ -34,10 +34,8 @@ module Api def test_permissions_oauth2 user = create(:user) - token = create(:oauth_access_token, - :resource_owner_id => user.id, - :scopes => %w[read_prefs write_api]) - get permissions_path, :headers => bearer_authorization_header(token.token) + auth_header = bearer_authorization_header(user, :scopes => %w[read_prefs write_api]) + get permissions_path, :headers => auth_header assert_response :success assert_select "osm > permissions", :count => 1 do assert_select "permission", :count => 2 diff --git a/test/controllers/api/user_preferences_controller_test.rb b/test/controllers/api/user_preferences_controller_test.rb index e2c573532..816be9b6e 100644 --- a/test/controllers/api/user_preferences_controller_test.rb +++ b/test/controllers/api/user_preferences_controller_test.rb @@ -252,10 +252,10 @@ module Api # read preferences def test_show_using_token user = create(:user) - token = create(:oauth_access_token, :resource_owner_id => user.id, :scopes => %w[read_prefs]) + auth_header = bearer_authorization_header(user, :scopes => %w[read_prefs]) create(:user_preference, :user => user, :k => "key", :v => "value") - get user_preference_path(:preference_key => "key"), :headers => bearer_authorization_header(token.token) + get user_preference_path(:preference_key => "key"), :headers => auth_header assert_response :success end @@ -264,10 +264,10 @@ module Api # by other methods. def test_show_using_token_fail user = create(:user) - token = create(:oauth_access_token, :resource_owner_id => user.id) + auth_header = bearer_authorization_header(user, :scopes => %w[]) create(:user_preference, :user => user, :k => "key", :v => "value") - get user_preference_path(:preference_key => "key"), :headers => bearer_authorization_header(token.token) + get user_preference_path(:preference_key => "key"), :headers => auth_header assert_response :forbidden end end diff --git a/test/controllers/api/users_controller_test.rb b/test/controllers/api/users_controller_test.rb index 5086a09b3..874d91771 100644 --- a/test/controllers/api/users_controller_test.rb +++ b/test/controllers/api/users_controller_test.rb @@ -79,18 +79,14 @@ module Api user = create(:user, :home_lat => 12.1, :home_lon => 23.4, :languages => ["en"]) - good_token = create(:oauth_access_token, - :resource_owner_id => user.id, - :scopes => %w[read_prefs]) - bad_token = create(:oauth_access_token, - :resource_owner_id => user.id, - :scopes => %w[]) + good_auth = bearer_authorization_header(user, :scopes => %w[read_prefs]) + bad_auth = bearer_authorization_header(user, :scopes => %w[]) other_user = create(:user, :home_lat => 12.1, :home_lon => 23.4, :languages => ["en"]) # check that we can fetch our own details as XML with read_prefs - get api_user_path(:id => user.id), :headers => bearer_authorization_header(good_token.token) + get api_user_path(:id => user.id), :headers => good_auth assert_response :success assert_equal "application/xml", response.media_type @@ -98,7 +94,7 @@ module Api check_xml_details(user, true, false) # check that we can fetch a different user's details as XML with read_prefs - get api_user_path(:id => other_user.id), :headers => bearer_authorization_header(good_token.token) + get api_user_path(:id => other_user.id), :headers => good_auth assert_response :success assert_equal "application/xml", response.media_type @@ -106,7 +102,7 @@ module Api check_xml_details(other_user, false, false) # check that we can fetch our own details as XML without read_prefs - get api_user_path(:id => user.id), :headers => bearer_authorization_header(bad_token.token) + get api_user_path(:id => user.id), :headers => bad_auth assert_response :success assert_equal "application/xml", response.media_type @@ -114,7 +110,7 @@ module Api check_xml_details(user, false, false) # check that we can fetch our own details as JSON with read_prefs - get api_user_path(:id => user.id, :format => "json"), :headers => bearer_authorization_header(good_token.token) + get api_user_path(:id => user.id, :format => "json"), :headers => good_auth assert_response :success assert_equal "application/json", response.media_type @@ -126,7 +122,7 @@ module Api check_json_details(js, user, true, false) # check that we can fetch a different user's details as JSON with read_prefs - get api_user_path(:id => other_user.id, :format => "json"), :headers => bearer_authorization_header(good_token.token) + get api_user_path(:id => other_user.id, :format => "json"), :headers => good_auth assert_response :success assert_equal "application/json", response.media_type @@ -138,7 +134,7 @@ module Api check_json_details(js, other_user, false, false) # check that we can fetch our own details as JSON without read_prefs - get api_user_path(:id => user.id, :format => "json"), :headers => bearer_authorization_header(bad_token.token) + get api_user_path(:id => user.id, :format => "json"), :headers => bad_auth assert_response :success assert_equal "application/json", response.media_type @@ -190,21 +186,16 @@ module Api user = create(:user, :home_lat => 12.1, :home_lon => 23.4, :languages => ["en"]) - good_token = create(:oauth_access_token, - :resource_owner_id => user.id, - :scopes => %w[read_prefs]) - bad_token = create(:oauth_access_token, - :resource_owner_id => user.id) - email_token = create(:oauth_access_token, - :resource_owner_id => user.id, - :scopes => %w[read_prefs read_email]) + good_auth = bearer_authorization_header(user, :scopes => %w[read_prefs]) + bad_auth = bearer_authorization_header(user, :scopes => %w[]) + email_auth = bearer_authorization_header(user, :scopes => %w[read_prefs read_email]) # check that we can't fetch details as XML without read_prefs - get user_details_path, :headers => bearer_authorization_header(bad_token.token) + get user_details_path, :headers => bad_auth assert_response :forbidden # check that we can fetch details as XML without read_email - get user_details_path, :headers => bearer_authorization_header(good_token.token) + get user_details_path, :headers => good_auth assert_response :success assert_equal "application/xml", response.media_type @@ -212,7 +203,7 @@ module Api check_xml_details(user, true, false) # check that we can fetch details as XML with read_email - get user_details_path, :headers => bearer_authorization_header(email_token.token) + get user_details_path, :headers => email_auth assert_response :success assert_equal "application/xml", response.media_type @@ -220,11 +211,11 @@ module Api check_xml_details(user, true, true) # check that we can't fetch details as JSON without read_prefs - get user_details_path(:format => "json"), :headers => bearer_authorization_header(bad_token.token) + get user_details_path(:format => "json"), :headers => bad_auth assert_response :forbidden # check that we can fetch details as JSON without read_email - get user_details_path(:format => "json"), :headers => bearer_authorization_header(good_token.token) + get user_details_path(:format => "json"), :headers => good_auth assert_response :success assert_equal "application/json", response.media_type @@ -236,7 +227,7 @@ module Api check_json_details(js, user, true, false) # check that we can fetch details as JSON with read_email - get user_details_path(:format => "json"), :headers => bearer_authorization_header(email_token.token) + get user_details_path(:format => "json"), :headers => email_auth assert_response :success assert_equal "application/json", response.media_type @@ -325,10 +316,10 @@ module Api user1 = create(:user, :description => "test1", :terms_agreed => Date.yesterday) user2 = create(:user, :description => "test2", :terms_agreed => Date.yesterday) user3 = create(:user, :description => "test3", :terms_agreed => Date.yesterday) - good_token = create(:oauth_access_token, :resource_owner_id => user1.id, :scopes => %w[read_prefs]) - bad_token = create(:oauth_access_token, :resource_owner_id => user1.id, :scopes => %w[]) + good_auth = bearer_authorization_header(user1, :scopes => %w[read_prefs]) + bad_auth = bearer_authorization_header(user1, :scopes => %w[]) - get api_users_path, :params => { :users => user1.id }, :headers => bearer_authorization_header(good_token.token) + get api_users_path, :params => { :users => user1.id }, :headers => good_auth assert_response :success assert_equal "application/xml", response.media_type assert_select "user", :count => 1 do @@ -337,7 +328,7 @@ module Api assert_select "user[id='#{user3.id}']", :count => 0 end - get api_users_path, :params => { :users => user2.id }, :headers => bearer_authorization_header(good_token.token) + get api_users_path, :params => { :users => user2.id }, :headers => good_auth assert_response :success assert_equal "application/xml", response.media_type assert_select "user", :count => 1 do @@ -346,7 +337,7 @@ module Api assert_select "user[id='#{user3.id}']", :count => 0 end - get api_users_path, :params => { :users => "#{user1.id},#{user3.id}" }, :headers => bearer_authorization_header(good_token.token) + get api_users_path, :params => { :users => "#{user1.id},#{user3.id}" }, :headers => good_auth assert_response :success assert_equal "application/xml", response.media_type assert_select "user", :count => 2 do @@ -355,7 +346,7 @@ module Api check_xml_details(user3, false, false) end - get api_users_path, :params => { :users => "#{user1.id},#{user3.id}" }, :headers => bearer_authorization_header(bad_token.token) + get api_users_path, :params => { :users => "#{user1.id},#{user3.id}" }, :headers => bad_auth assert_response :success assert_equal "application/xml", response.media_type assert_select "user", :count => 2 do @@ -364,7 +355,7 @@ module Api check_xml_details(user3, false, false) end - get api_users_path, :params => { :users => user1.id, :format => "json" }, :headers => bearer_authorization_header(good_token.token) + get api_users_path, :params => { :users => user1.id, :format => "json" }, :headers => good_auth assert_response :success assert_equal "application/json", response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -372,7 +363,7 @@ module Api assert_equal 1, js["users"].count check_json_details(js["users"][0], user1, true, false) - get api_users_path, :params => { :users => user2.id, :format => "json" }, :headers => bearer_authorization_header(good_token.token) + get api_users_path, :params => { :users => user2.id, :format => "json" }, :headers => good_auth assert_response :success assert_equal "application/json", response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -380,7 +371,7 @@ module Api assert_equal 1, js["users"].count check_json_details(js["users"][0], user2, false, false) - get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :headers => bearer_authorization_header(good_token.token) + get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :headers => good_auth assert_response :success assert_equal "application/json", response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -389,7 +380,7 @@ module Api check_json_details(js["users"][0], user1, true, false) check_json_details(js["users"][1], user3, false, false) - get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :headers => bearer_authorization_header(bad_token.token) + get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :headers => bad_auth assert_response :success assert_equal "application/json", response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -398,17 +389,17 @@ module Api check_json_details(js["users"][0], user1, false, false) check_json_details(js["users"][1], user3, false, false) - get api_users_path, :params => { :users => create(:user, :suspended).id }, :headers => bearer_authorization_header(good_token.token) + get api_users_path, :params => { :users => create(:user, :suspended).id }, :headers => good_auth assert_response :success assert_equal "application/xml", response.media_type assert_select "user", :count => 0 - get api_users_path, :params => { :users => create(:user, :deleted).id }, :headers => bearer_authorization_header(good_token.token) + get api_users_path, :params => { :users => create(:user, :deleted).id }, :headers => good_auth assert_response :success assert_equal "application/xml", response.media_type assert_select "user", :count => 0 - get api_users_path, :params => { :users => 0 }, :headers => bearer_authorization_header(good_token.token) + get api_users_path, :params => { :users => 0 }, :headers => good_auth assert_response :success assert_equal "application/xml", response.media_type assert_select "user", :count => 0 -- 2.39.5