Don't order by id when getting last records

[rails.git] / test / controllers / preferences_controller_test.rb

diff --git a/test/controllers/preferences_controller_test.rb b/test/controllers/preferences_controller_test.rb
index 8c529e62a009f3ecb44af280282a5181a876c487..81760fe5de54816a88b448dcdd6a47e3ea008a8e 100644 (file)
--- a/test/controllers/preferences_controller_test.rb
+++ b/test/controllers/preferences_controller_test.rb
@@ -29,28 +29,26 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest
     put preferences_path, :params => { :user => user.attributes }
     assert_response :success
     assert_template :edit
     put preferences_path, :params => { :user => user.attributes }
     assert_response :success
     assert_template :edit

-    assert_select ".notice", false
-    assert_select ".error", true
-    assert_select "form > div.form-group > select#user_preferred_editor > option[selected]", false
+    assert_select ".alert-success", false
+    assert_select ".alert-danger", true
+    assert_select "form > div > select#user_preferred_editor > option[selected]", false

 
     # Changing to a valid editor should work
     user.preferred_editor = "id"
     put preferences_path, :params => { :user => user.attributes }
 
     # Changing to a valid editor should work
     user.preferred_editor = "id"
     put preferences_path, :params => { :user => user.attributes }

-    assert_response :redirect

     assert_redirected_to preferences_path
     follow_redirect!
     assert_template :show
     assert_redirected_to preferences_path
     follow_redirect!
     assert_template :show

-    assert_select ".notice", /^Preferences updated/
+    assert_select ".alert-success", /^Preferences updated/

     assert_select "dd", "iD (in-browser editor)"
 
     # Changing to the default editor should work
     user.preferred_editor = "default"
     put preferences_path, :params => { :user => user.attributes }
     assert_select "dd", "iD (in-browser editor)"
 
     # Changing to the default editor should work
     user.preferred_editor = "default"
     put preferences_path, :params => { :user => user.attributes }

-    assert_response :redirect

     assert_redirected_to preferences_path
     follow_redirect!
     assert_template :show
     assert_redirected_to preferences_path
     follow_redirect!
     assert_template :show

-    assert_select ".notice", /^Preferences updated/
+    assert_select ".alert-success", /^Preferences updated/

     assert_select "dd", "Default (currently iD)"
   end
 end
     assert_select "dd", "Default (currently iD)"
   end
 end