jro_apps/redmine Commit - r8356:395fe0d777f2

Test cleanup....

Jean-Philippe Lang -

r8356:395fe0d777f2

parent child

Context file:

r8356:395fe0d777f2

Collapse all files

test/integration/api_test/disabled_rest_api_test.rb +4 -8

                   context "with a valid HTTP authentication" do
                     setup do
                       @user = User.generate_with_protected!(:password => 'my_password', :password_confirmation => 'my_password')
-                      @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@user.login, 'my_password')
+                      get "/news.xml", nil, :authorization => credentials(@user.login, 'my_password')
-                      get "/news.xml", nil, :authorization => @authorization
                     end
                     should_respond_with :unauthorized
                     setup do
                       @user = User.generate_with_protected!
                       @token = Token.generate!(:user => @user, :action => 'api')
-                      @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@token.value, 'X')
+                      get "/news.xml", nil, :authorization => credentials(@token.value, 'X')
-                      get "/news.xml", nil, :authorization => @authorization
                     end
                     should_respond_with :unauthorized
                   context "with a valid HTTP authentication" do
                     setup do
                       @user = User.generate_with_protected!(:password => 'my_password', :password_confirmation => 'my_password')
-                      @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@user.login, 'my_password')
+                      get "/news.json", nil, :authorization => credentials(@user.login, 'my_password')
-                      get "/news.json", nil, :authorization => @authorization
                     end
                     should_respond_with :unauthorized
                     setup do
                       @user = User.generate_with_protected!
                       @token = Token.generate!(:user => @user, :action => 'api')
-                      @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@token.value, 'DoesNotMatter')
+                      get "/news.json", nil, :authorization => credentials(@token.value, 'DoesNotMatter')
-                      get "/news.json", nil, :authorization => @authorization
                     end
                     should_respond_with :unauthorized

test/test_helper.rb +4 -8

                   context "with a valid HTTP authentication" do
                     setup do
                       @user = User.generate_with_protected!(:password => 'my_password', :password_confirmation => 'my_password', :admin => true) # Admin so they can access the project
-                      @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@user.login, 'my_password')
+                      send(http_method, url, parameters, {:authorization => credentials(@user.login, 'my_password')})
-                      send(http_method, url, parameters, {:authorization => @authorization})
                     end
                     should_respond_with success_code
                   context "with an invalid HTTP authentication" do
                     setup do
                       @user = User.generate_with_protected!
-                      @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@user.login, 'wrong_password')
+                      send(http_method, url, parameters, {:authorization => credentials(@user.login, 'wrong_password')})
-                      send(http_method, url, parameters, {:authorization => @authorization})
                     end
                     should_respond_with failure_code
                     setup do
                       @user = User.generate_with_protected!(:admin => true)
                       @token = Token.generate!(:user => @user, :action => 'api')
-                      @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@token.value, 'X')
+                      send(http_method, url, parameters, {:authorization => credentials(@token.value, 'X')})
-                      send(http_method, url, parameters, {:authorization => @authorization})
                     end
                     should_respond_with success_code
                     setup do
                       @user = User.generate_with_protected!
                       @token = Token.generate!(:user => @user, :action => 'feeds')
-                      @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@token.value, 'X')
+                      send(http_method, url, parameters, {:authorization => credentials(@token.value, 'X')})
-                      send(http_method, url, parameters, {:authorization => @authorization})
                     end
                     should_respond_with failure_code

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages