summaryrefslogtreecommitdiff
path: root/users/test/functional
diff options
context:
space:
mode:
Diffstat (limited to 'users/test/functional')
-rw-r--r--users/test/functional/users_controller_test.rb19
-rw-r--r--users/test/functional/v1/users_controller_test.rb8
2 files changed, 5 insertions, 22 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
diff --git a/users/test/functional/v1/users_controller_test.rb b/users/test/functional/v1/users_controller_test.rb
index a330bf3..7cd9b0c 100644
--- a/users/test/functional/v1/users_controller_test.rb
+++ b/users/test/functional/v1/users_controller_test.rb
@@ -7,7 +7,7 @@ class V1::UsersControllerTest < ActionController::TestCase
changed_attribs = record_attributes_for :user_with_settings
account_settings = stub
account_settings.expects(:update).with(changed_attribs)
- AccountSettings.expects(:new).with(user).returns(account_settings)
+ Account.expects(:new).with(user).returns(account_settings)
login user
put :update, :user => changed_attribs, :id => user.id, :format => :json
@@ -22,7 +22,7 @@ class V1::UsersControllerTest < ActionController::TestCase
changed_attribs = record_attributes_for :user_with_settings
account_settings = stub
account_settings.expects(:update).with(changed_attribs)
- AccountSettings.expects(:new).with(user).returns(account_settings)
+ Account.expects(:new).with(user).returns(account_settings)
login :is_admin? => true
put :update, :user => changed_attribs, :id => user.id, :format => :json
@@ -41,7 +41,7 @@ class V1::UsersControllerTest < ActionController::TestCase
test "should create new user" do
user_attribs = record_attributes_for :user
user = User.new(user_attribs)
- User.expects(:create).with(user_attribs).returns(user)
+ Account.expects(:create).with(user_attribs).returns(user)
post :create, :user => user_attribs, :format => :json
@@ -55,7 +55,7 @@ class V1::UsersControllerTest < ActionController::TestCase
user_attribs.slice!('login')
user = User.new(user_attribs)
assert !user.valid?
- User.expects(:create).with(user_attribs).returns(user)
+ Account.expects(:create).with(user_attribs).returns(user)
post :create, :user => user_attribs, :format => :json