remove trailing white-spaces from test/integration/api_test/users_test.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6933 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
parent
32c2cf80e3
commit
9e69cab15d
|
|
@ -1,16 +1,16 @@
|
|||
# Redmine - project management software
|
||||
# Copyright (C) 2006-2010 Jean-Philippe Lang
|
||||
# Copyright (C) 2006-2011 Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
|
@ -33,7 +33,7 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
|
|||
context ".xml" do
|
||||
should "return requested user" do
|
||||
get '/users/2.xml'
|
||||
|
||||
|
||||
assert_tag :tag => 'user',
|
||||
:child => {:tag => 'id', :content => '2'}
|
||||
end
|
||||
|
|
@ -42,7 +42,7 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
|
|||
context ".json" do
|
||||
should "return requested user" do
|
||||
get '/users/2.json'
|
||||
|
||||
|
||||
json = ActiveSupport::JSON.decode(response.body)
|
||||
assert_kind_of Hash, json
|
||||
assert_kind_of Hash, json['user']
|
||||
|
|
@ -50,18 +50,18 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
context "GET /users/current" do
|
||||
context ".xml" do
|
||||
should "require authentication" do
|
||||
get '/users/current.xml'
|
||||
|
||||
|
||||
assert_response 401
|
||||
end
|
||||
|
||||
|
||||
should "return current user" do
|
||||
get '/users/current.xml', {}, :authorization => credentials('jsmith')
|
||||
|
||||
|
||||
assert_tag :tag => 'user',
|
||||
:child => {:tag => 'id', :content => '2'}
|
||||
end
|
||||
|
|
@ -73,18 +73,18 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
|
|||
setup do
|
||||
@parameters = {:user => {:login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname', :mail => 'foo@example.net', :password => 'secret', :mail_notification => 'only_assigned'}}
|
||||
end
|
||||
|
||||
|
||||
context ".xml" do
|
||||
should_allow_api_authentication(:post,
|
||||
'/users.xml',
|
||||
{:user => {:login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname', :mail => 'foo@example.net', :password => 'secret'}},
|
||||
{:success_code => :created})
|
||||
|
||||
|
||||
should "create a user with the attributes" do
|
||||
assert_difference('User.count') do
|
||||
post '/users.xml', @parameters, :authorization => credentials('admin')
|
||||
end
|
||||
|
||||
|
||||
user = User.first(:order => 'id DESC')
|
||||
assert_equal 'foo', user.login
|
||||
assert_equal 'Firstname', user.firstname
|
||||
|
|
@ -93,31 +93,31 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
|
|||
assert_equal 'only_assigned', user.mail_notification
|
||||
assert !user.admin?
|
||||
assert user.check_password?('secret')
|
||||
|
||||
|
||||
assert_response :created
|
||||
assert_equal 'application/xml', @response.content_type
|
||||
assert_tag 'user', :child => {:tag => 'id', :content => user.id.to_s}
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
context ".json" do
|
||||
should_allow_api_authentication(:post,
|
||||
'/users.json',
|
||||
{:user => {:login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname', :mail => 'foo@example.net'}},
|
||||
{:success_code => :created})
|
||||
|
||||
|
||||
should "create a user with the attributes" do
|
||||
assert_difference('User.count') do
|
||||
post '/users.json', @parameters, :authorization => credentials('admin')
|
||||
end
|
||||
|
||||
|
||||
user = User.first(:order => 'id DESC')
|
||||
assert_equal 'foo', user.login
|
||||
assert_equal 'Firstname', user.firstname
|
||||
assert_equal 'Lastname', user.lastname
|
||||
assert_equal 'foo@example.net', user.mail
|
||||
assert !user.admin?
|
||||
|
||||
|
||||
assert_response :created
|
||||
assert_equal 'application/json', @response.content_type
|
||||
json = ActiveSupport::JSON.decode(response.body)
|
||||
|
|
@ -127,30 +127,30 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
context "with invalid parameters" do
|
||||
setup do
|
||||
@parameters = {:user => {:login => 'foo', :lastname => 'Lastname', :mail => 'foo'}}
|
||||
end
|
||||
|
||||
|
||||
context ".xml" do
|
||||
should "return errors" do
|
||||
assert_no_difference('User.count') do
|
||||
post '/users.xml', @parameters, :authorization => credentials('admin')
|
||||
end
|
||||
|
||||
|
||||
assert_response :unprocessable_entity
|
||||
assert_equal 'application/xml', @response.content_type
|
||||
assert_tag 'errors', :child => {:tag => 'error', :content => "First name can't be blank"}
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
context ".json" do
|
||||
should "return errors" do
|
||||
assert_no_difference('User.count') do
|
||||
post '/users.json', @parameters, :authorization => credentials('admin')
|
||||
end
|
||||
|
||||
|
||||
assert_response :unprocessable_entity
|
||||
assert_equal 'application/json', @response.content_type
|
||||
json = ActiveSupport::JSON.decode(response.body)
|
||||
|
|
@ -167,75 +167,75 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
|
|||
setup do
|
||||
@parameters = {:user => {:login => 'jsmith', :firstname => 'John', :lastname => 'Renamed', :mail => 'jsmith@somenet.foo'}}
|
||||
end
|
||||
|
||||
|
||||
context ".xml" do
|
||||
should_allow_api_authentication(:put,
|
||||
'/users/2.xml',
|
||||
{:user => {:login => 'jsmith', :firstname => 'John', :lastname => 'Renamed', :mail => 'jsmith@somenet.foo'}},
|
||||
{:success_code => :ok})
|
||||
|
||||
|
||||
should "update user with the attributes" do
|
||||
assert_no_difference('User.count') do
|
||||
put '/users/2.xml', @parameters, :authorization => credentials('admin')
|
||||
end
|
||||
|
||||
|
||||
user = User.find(2)
|
||||
assert_equal 'jsmith', user.login
|
||||
assert_equal 'John', user.firstname
|
||||
assert_equal 'Renamed', user.lastname
|
||||
assert_equal 'jsmith@somenet.foo', user.mail
|
||||
assert !user.admin?
|
||||
|
||||
|
||||
assert_response :ok
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
context ".json" do
|
||||
should_allow_api_authentication(:put,
|
||||
'/users/2.json',
|
||||
{:user => {:login => 'jsmith', :firstname => 'John', :lastname => 'Renamed', :mail => 'jsmith@somenet.foo'}},
|
||||
{:success_code => :ok})
|
||||
|
||||
|
||||
should "update user with the attributes" do
|
||||
assert_no_difference('User.count') do
|
||||
put '/users/2.json', @parameters, :authorization => credentials('admin')
|
||||
end
|
||||
|
||||
|
||||
user = User.find(2)
|
||||
assert_equal 'jsmith', user.login
|
||||
assert_equal 'John', user.firstname
|
||||
assert_equal 'Renamed', user.lastname
|
||||
assert_equal 'jsmith@somenet.foo', user.mail
|
||||
assert !user.admin?
|
||||
|
||||
|
||||
assert_response :ok
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
context "with invalid parameters" do
|
||||
setup do
|
||||
@parameters = {:user => {:login => 'jsmith', :firstname => '', :lastname => 'Lastname', :mail => 'foo'}}
|
||||
end
|
||||
|
||||
|
||||
context ".xml" do
|
||||
should "return errors" do
|
||||
assert_no_difference('User.count') do
|
||||
put '/users/2.xml', @parameters, :authorization => credentials('admin')
|
||||
end
|
||||
|
||||
|
||||
assert_response :unprocessable_entity
|
||||
assert_equal 'application/xml', @response.content_type
|
||||
assert_tag 'errors', :child => {:tag => 'error', :content => "First name can't be blank"}
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
context ".json" do
|
||||
should "return errors" do
|
||||
assert_no_difference('User.count') do
|
||||
put '/users/2.json', @parameters, :authorization => credentials('admin')
|
||||
end
|
||||
|
||||
|
||||
assert_response :unprocessable_entity
|
||||
assert_equal 'application/json', @response.content_type
|
||||
json = ActiveSupport::JSON.decode(response.body)
|
||||
|
|
@ -246,39 +246,39 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
context "DELETE /users/2" do
|
||||
context ".xml" do
|
||||
should_allow_api_authentication(:delete,
|
||||
'/users/2.xml',
|
||||
{},
|
||||
{:success_code => :ok})
|
||||
|
||||
|
||||
should "delete user" do
|
||||
assert_difference('User.count', -1) do
|
||||
delete '/users/2.xml', {}, :authorization => credentials('admin')
|
||||
end
|
||||
|
||||
|
||||
assert_response :ok
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
context ".json" do
|
||||
should_allow_api_authentication(:delete,
|
||||
'/users/2.xml',
|
||||
{},
|
||||
{:success_code => :ok})
|
||||
|
||||
|
||||
should "delete user" do
|
||||
assert_difference('User.count', -1) do
|
||||
delete '/users/2.json', {}, :authorization => credentials('admin')
|
||||
end
|
||||
|
||||
|
||||
assert_response :ok
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def credentials(user, password=nil)
|
||||
ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user)
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue