summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-08-30 10:33:39 +0200
committerAzul <azul@leap.se>2013-09-03 08:54:25 +0200
commit83068449b1c874bb5d09a3e189fe7d7669c25780 (patch)
tree3591847df85aebd75918c5af30a6e94a0d05ff8c
parente2a3daa9ae3f3570aca0dc22b70d87252e599d7a (diff)
simplify users_controller_test
-rw-r--r--users/test/functional/users_controller_test.rb19
1 files changed, 1 insertions, 18 deletions
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 96ae48c..052de04 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -10,21 +10,14 @@ class UsersControllerTest < ActionController::TestCase
end
test "failed show without login" do
- user = FactoryGirl.build(:user)
- user.save
+ user = find_record :user
get :show, :id => user.id
assert_response :redirect
assert_redirected_to login_path
- user.destroy
end
test "user can see user" do
user = find_record :user,
- :email => nil,
- :email_forward => nil,
- :email_aliases => [],
- :created_at => Time.now,
- :updated_at => Time.now,
:most_recent_tickets => []
login user
get :show, :id => user.id
@@ -33,11 +26,6 @@ class UsersControllerTest < ActionController::TestCase
test "admin can see other user" do
user = find_record :user,
- :email => nil,
- :email_forward => nil,
- :email_aliases => [],
- :created_at => Time.now,
- :updated_at => Time.now,
:most_recent_tickets => []
login :is_admin? => true
get :show, :id => user.id
@@ -47,11 +35,6 @@ class UsersControllerTest < ActionController::TestCase
test "user cannot see other user" do
user = find_record :user,
- :email => nil,
- :email_forward => nil,
- :email_aliases => [],
- :created_at => Time.now,
- :updated_at => Time.now,
:most_recent_tickets => []
login
get :show, :id => user.id