From 149c07fd2bc33a8974d0b0f6e8ab5425d3178374 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 31 Oct 2018 11:36:24 +0100 Subject: [PATCH] Remove unnecessary token granting from the user_preferences tests Sufficient permissions are granted by the basic authorisation, so this isn't testing anything. --- test/controllers/user_preferences_controller_test.rb | 5 ----- test/test_helper.rb | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/test/controllers/user_preferences_controller_test.rb b/test/controllers/user_preferences_controller_test.rb index 1a51779ed..3e5cbb369 100644 --- a/test/controllers/user_preferences_controller_test.rb +++ b/test/controllers/user_preferences_controller_test.rb @@ -35,7 +35,6 @@ class UserPreferencesControllerTest < ActionController::TestCase # authenticate as a user with no preferences basic_authorization create(:user).email, "test" - grant_oauth_token :allow_read_prefs # try the read again get :read @@ -76,7 +75,6 @@ class UserPreferencesControllerTest < ActionController::TestCase # authenticate as a user with preferences basic_authorization user.email, "test" - grant_oauth_token :allow_read_prefs # try the read again get :read_one, :params => { :preference_key => "key" } @@ -110,7 +108,6 @@ class UserPreferencesControllerTest < ActionController::TestCase # authenticate as a user with preferences basic_authorization user.email, "test" - grant_oauth_token :allow_write_prefs # try the put again assert_no_difference "UserPreference.count" do @@ -162,7 +159,6 @@ class UserPreferencesControllerTest < ActionController::TestCase # authenticate as a user with preferences basic_authorization user.email, "test" - grant_oauth_token :allow_write_prefs # try adding a new preference assert_difference "UserPreference.count", 1 do @@ -200,7 +196,6 @@ class UserPreferencesControllerTest < ActionController::TestCase # authenticate as a user with preferences basic_authorization user.email, "test" - grant_oauth_token :allow_write_prefs # try the delete again assert_difference "UserPreference.count", -1 do diff --git a/test/test_helper.rb b/test/test_helper.rb index b7b934552..83cf909dd 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -87,16 +87,6 @@ module ActiveSupport @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}")) end - ## - # set oauth token permissions - def grant_oauth_token(*tokens) - request.env["oauth.token"] = AccessToken.new do |token| - tokens.each do |t| - token.public_send("#{t}=", true) - end - end - end - ## # set request readers to ask for a particular error format def error_format(format) -- 2.39.5