diff test/functional/users_controller_test.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/test/functional/users_controller_test.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/test/functional/users_controller_test.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -169,7 +169,7 @@
       end
     end
 
-    user = User.first(:order => 'id DESC')
+    user = User.order('id DESC').first
     assert_redirected_to :controller => 'users', :action => 'edit', :id => user.id
 
     assert_equal 'John', user.firstname
@@ -204,7 +204,7 @@
           'warn_on_leaving_unsaved' => '0'
         }
     end
-    user = User.first(:order => 'id DESC')
+    user = User.order('id DESC').first
     assert_equal 'jdoe', user.login
     assert_equal true, user.pref.hide_mail
     assert_equal 'Paris', user.pref.time_zone
@@ -244,6 +244,25 @@
     assert_template 'new'
   end
 
+  def test_create_with_failure_sould_preserve_preference
+    assert_no_difference 'User.count' do
+      post :create,
+        :user => {},
+        :pref => {
+          'no_self_notified' => '1',
+          'hide_mail' => '1',
+          'time_zone' => 'Paris',
+          'comments_sorting' => 'desc',
+          'warn_on_leaving_unsaved' => '0'
+        }
+    end
+    assert_response :success
+    assert_template 'new'
+
+    assert_select 'select#pref_time_zone option[selected=selected]', :text => /Paris/
+    assert_select 'input#pref_no_self_notified[value=1][checked=checked]'
+  end
+
   def test_edit
     get :edit, :id => 2
     assert_response :success
@@ -411,7 +430,7 @@
       post :edit_membership, :id => 7, :membership => { :project_id => 3, :role_ids => [2]}
     end
     assert_redirected_to :action => 'edit', :id => '7', :tab => 'memberships'
-    member = Member.first(:order => 'id DESC')
+    member = Member.order('id DESC').first
     assert_equal User.find(7), member.principal
     assert_equal [2], member.role_ids
     assert_equal 3, member.project_id
@@ -424,7 +443,7 @@
       assert_template 'edit_membership'
       assert_equal 'text/javascript', response.content_type
     end
-    member = Member.first(:order => 'id DESC')
+    member = Member.order('id DESC').first
     assert_equal User.find(7), member.principal
     assert_equal [2], member.role_ids
     assert_equal 3, member.project_id