summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2017-03-21 10:42:17 +0100
committerAzul <azul@riseup.net>2017-03-21 10:42:27 +0100
commit1115838e2acecd82fc2a13c55a631a8cfa42520e (patch)
treeb3b5abc48840e8dd82aeaf1b869391c49d2c9b78 /test
parent987d1bf7c87f7ea3d17c40015b2ec92a8a0b4ecc (diff)
test: admin user api always green
Used to fail because the record already existed in the database fixes #17
Diffstat (limited to 'test')
-rw-r--r--test/functional/api/users_controller_test.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/test/functional/api/users_controller_test.rb b/test/functional/api/users_controller_test.rb
index b69770d..88ecae0 100644
--- a/test/functional/api/users_controller_test.rb
+++ b/test/functional/api/users_controller_test.rb
@@ -95,11 +95,13 @@ class Api::UsersControllerTest < ApiControllerTest
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)
+ admin = FactoryGirl.create :user
+ with_config(admins: [admin.login]) do
+ login admin
+ api_get :show, :id => admin.id, :format => :json
+ assert_response :success
+ assert_json_response admin.to_hash.merge(:is_admin => true)
+ end
end
test "normal users cannot show user" do