summaryrefslogtreecommitdiffstats
path: root/test/functional
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/admin_controller_test.rb2
-rw-r--r--test/functional/users_controller_test.rb12
2 files changed, 13 insertions, 1 deletions
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index 48f3aad55..794775c0c 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -83,7 +83,7 @@ class AdminControllerTest < ActionController::TestCase
def test_test_email
user = User.find(1)
- user.pref[:no_self_notified] = '1'
+ user.pref.no_self_notified = '1'
user.pref.save!
ActionMailer::Base.deliveries.clear
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 65aa2d7c0..bf8f444af 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -380,6 +380,18 @@ class UsersControllerTest < ActionController::TestCase
assert_equal [1, 2], u.notified_projects_ids.sort
end
+ def test_update_status_should_not_update_attributes
+ user = User.find(2)
+ user.pref[:no_self_notified] = '1'
+ user.pref.save
+
+ put :update, :id => 2, :user => {:status => 3}
+ assert_response 302
+ user = User.find(2)
+ assert_equal 3, user.status
+ assert_equal '1', user.pref[:no_self_notified]
+ end
+
def test_destroy
assert_difference 'User.count', -1 do
delete :destroy, :id => 2