summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/functional/api/users_controller_test.rb12
-rw-r--r--test/integration/api/signup_test.rb2
-rw-r--r--test/unit/user_test.rb13
3 files changed, 17 insertions, 10 deletions
diff --git a/test/functional/api/users_controller_test.rb b/test/functional/api/users_controller_test.rb
index 32afd0a..b69770d 100644
--- a/test/functional/api/users_controller_test.rb
+++ b/test/functional/api/users_controller_test.rb
@@ -86,14 +86,22 @@ class Api::UsersControllerTest < ApiControllerTest
login :is_admin? => true
api_get :show, :id => 0, :login => user.login, :format => :json
assert_response :success
- assert_json_response user
+ assert_json_response user.to_hash
api_get :show, :id => user.id, :format => :json
assert_response :success
- assert_json_response user
+ assert_json_response user.to_hash
api_get :show, :id => "0", :format => :json
assert_response :not_found
end
+ test "admin can show is_admin property" do
+ user = FactoryGirl.create :user, login: "admin2"
+ login user
+ api_get :show, :id => user.id, :format => :json
+ assert_response :success
+ assert_json_response user.to_hash.merge(:is_admin => true)
+ end
+
test "normal users cannot show user" do
user = find_record :user
login
diff --git a/test/integration/api/signup_test.rb b/test/integration/api/signup_test.rb
index 2e515c1..dc24420 100644
--- a/test/integration/api/signup_test.rb
+++ b/test/integration/api/signup_test.rb
@@ -8,7 +8,7 @@ class SignupTest < SrpTest
end
test "signup response" do
- assert_json_response :login => @login, :ok => true, :is_admin => false, :id => @user.id, :enabled => true
+ assert_json_response :login => @login, :ok => true, :id => @user.id, :enabled => true
assert last_response.successful?
end
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 55d0648..02e94df 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -71,13 +71,12 @@ class UserTest < ActiveSupport::TestCase
assert_equal key, @user.public_key
end
- test "user to json includes id, login, valid, is_admin and enabled" do
- json_content = JSON.parse @user.to_json
- assert_equal @user.id, json_content["id"]
- assert_equal @user.valid?, json_content["ok"]
- assert_equal @user.login, json_content["login"]
- assert_equal @user.enabled?, json_content["enabled"]
- assert_equal @user.is_admin?, json_content["is_admin"]
+ test "user to hash includes id, login, valid and enabled" do
+ hash = @user.to_hash
+ assert_equal @user.id, hash[:id]
+ assert_equal @user.valid?, hash[:ok]
+ assert_equal @user.login, hash[:login]
+ assert_equal @user.enabled?, hash[:enabled]
end