Tests de contrôleurs à peu près completes, et propres

Author: echarp

test/controllers/admin/accounts_controller_test.rb

@@ -10,11 +10,13 @@ class Admin::AccountsControllerTest < ActionDispatch::IntegrationTest
   test 'should not list accounts' do
     sign_in accounts 'visitor_0'
     get admin_accounts_url
+
     assert_redirected_to account_session_url
   end
 
   test 'should list accounts' do
     get admin_accounts_url
+
     assert_response :success
   end
 
@@ -26,33 +28,41 @@ class Admin::AccountsControllerTest < ActionDispatch::IntegrationTest
       email: '[email protected]',
       inactive: '1'
     }
+
     assert_response :success
   end
 
   test 'should send password reset' do
     post password_admin_account_url(accounts(:anonymous))
+
     assert_redirected_to admin_accounts_url
   end
 
   test 'should give karma' do
     post karma_admin_account_url(accounts(:anonymous))
+
     assert_redirected_to accounts(:anonymous).user
   end
 
-  test 'should activate/inactivate account' do
+  test 'should activate account' do
     patch admin_account_url accounts(:anonymous)
+
     assert_nil flash[:alert]
     assert_equal 'Compte réactivé', flash[:notice]
     assert_redirected_to admin_accounts_url
+  end
+
+  test 'should inactivate account' do
+    patch admin_account_url accounts('visitor_999')
 
-    patch admin_account_url accounts(:anonymous)
     assert_nil flash[:alert]
     assert_equal 'Compte désactivé', flash[:notice]
     assert_redirected_to admin_accounts_url
   end
 
   test 'should destroy account' do
     delete admin_account_url(accounts(:anonymous))
+
     assert_redirected_to admin_accounts_url
   end
 end

test/controllers/admin/admins_controller_test.rb

@@ -9,13 +9,15 @@ class Admin::AdminsControllerTest < ActionDispatch::IntegrationTest
 
   test 'should create admin' do
     post admin_account_admin_url(accounts('visitor_0'))
+
     assert_nil flash[:alert]
     assert flash[:notice]
     assert_redirected_to accounts('visitor_0').user
   end
 
   test 'should destroy admin' do
     delete admin_account_admin_url(accounts('admin_0'))
+
     assert_nil flash[:alert]
     assert flash[:notice]
     assert_redirected_to accounts('admin_0').user

test/controllers/admin/applications_controller_test.rb

@@ -9,13 +9,15 @@ class Admin::ApplicationsControllerTest < ActionDispatch::IntegrationTest
 
   test 'should list applications' do
     get admin_applications_url
+
     assert_response :success
   end
 
   test 'should not update application' do
     patch admin_application_url(Doorkeeper::Application.first), params: {
       doorkeeper_application: { name: 'New name' }
     }
+
     assert_response :success
   end
 
@@ -27,6 +29,7 @@ class Admin::ApplicationsControllerTest < ActionDispatch::IntegrationTest
     patch admin_application_url(app), params: {
       doorkeeper_application: { name: 'New name' }
     }
+
     assert_nil flash[:alert]
     assert flash[:notice]
     assert_redirected_to admin_applications_url

test/controllers/admin/banners_controller_test.rb

@@ -7,13 +7,20 @@ class Admin::BannersControllerTest < ActionDispatch::IntegrationTest
     sign_in accounts 'admin_0'
   end
 
+  teardown do
+    # Reset
+    $redis.del('banners')
+  end
+
   test 'should list banners' do
     get admin_banners_url
+
     assert_response :success
   end
 
   test 'should get new' do
     get new_admin_banner_url
+
     assert_response :success
   end
 
@@ -46,6 +53,7 @@ class Admin::BannersControllerTest < ActionDispatch::IntegrationTest
 
   test 'should edit banner' do
     get edit_admin_banner_url(banners(:one))
+
     assert_response :success
   end
 
@@ -71,6 +79,7 @@ class Admin::BannersControllerTest < ActionDispatch::IntegrationTest
               content: 'This is a banner'
             }
           }
+
     assert_redirected_to admin_banners_url
   end
 

test/controllers/admin/categories_controller_test.rb

@@ -9,11 +9,13 @@ class Admin::CategoriesControllerTest < ActionDispatch::IntegrationTest
 
   test 'should list categories' do
     get admin_categories_url
+
     assert_response :success
   end
 
   test 'should get new' do
     get new_admin_category_url
+
     assert_response :success
   end
 
@@ -22,6 +24,7 @@ class Admin::CategoriesControllerTest < ActionDispatch::IntegrationTest
       post admin_categories_url, params: {
         category: { title: '' }
       }
+
       assert flash[:alert]
     end
     assert_response :success
@@ -32,20 +35,23 @@ class Admin::CategoriesControllerTest < ActionDispatch::IntegrationTest
       post admin_categories_url, params: {
         category: { title: 'Hello world' }
       }
+
       assert_nil flash[:alert]
     end
     assert_redirected_to admin_categories_url
   end
 
   test 'should get edit' do
     get edit_admin_category_url(categories(:one))
+
     assert_response :success
   end
 
   test 'should not update category' do
     patch admin_category_url(categories(:one)), params: {
       category: { title: '' }
     }
+
     assert flash[:alert]
     assert_response :success
   end
@@ -54,13 +60,15 @@ class Admin::CategoriesControllerTest < ActionDispatch::IntegrationTest
     patch admin_category_url(categories(:one)), params: {
       category: { title: 'Hello world' }
     }
+
     assert_nil flash[:alert]
     assert_redirected_to admin_categories_url
   end
 
   test 'should destroy category' do
     assert_difference('Category.count', -1) do
       delete admin_category_url(categories(:two))
+
       assert_nil flash[:alert]
     end
     assert_redirected_to admin_categories_url

test/controllers/admin/editors_controller_test.rb

@@ -10,7 +10,7 @@ class Admin::EditorsControllerTest < ActionDispatch::IntegrationTest
   test 'should authorize editor' do
     assert_difference 'Account.editor.count' do
       post admin_account_editor_url accounts('visitor_0')
-      assert_nil flash[:alert]
+
       assert flash[:notice]
     end
     assert_redirected_to accounts('visitor_0').user
@@ -19,7 +19,7 @@ class Admin::EditorsControllerTest < ActionDispatch::IntegrationTest
   test 'should destroy editor' do
     assert_difference 'Account.editor.count', -1 do
       delete admin_account_editor_url accounts('editor_0')
-      assert_nil flash[:alert]
+
       assert flash[:notice]
     end
     assert_redirected_to accounts('editor_0').user

test/controllers/admin/forums_controller_test.rb

@@ -9,11 +9,13 @@ class Admin::ForumsControllerTest < ActionDispatch::IntegrationTest
 
   test 'should list forums' do
     get admin_forums_url
+
     assert_response :success
   end
 
   test 'should get new' do
     get new_admin_forum_url
+
     assert_response :success
   end
 
@@ -34,45 +36,47 @@ class Admin::ForumsControllerTest < ActionDispatch::IntegrationTest
           cached_slug: 'hello-world'
         }
       }
-      assert_nil flash[:alert]
+
       assert flash[:notice]
     end
     assert_redirected_to admin_forums_url
   end
 
   test 'should get edit' do
     get edit_admin_forum_url(forums(:one))
+
     assert_response :success
   end
 
   test 'should not update forum' do
     patch admin_forum_url(forums(:one)), params: {
       forum: { title: '' }
     }
+
     assert_response :success
   end
 
   test 'should update forum' do
     patch admin_forum_url(forums(:one)), params: {
       forum: { title: 'Hello world' }
     }
-    assert_nil flash[:alert]
+
     assert flash[:notice]
     assert_redirected_to admin_forums_url
   end
 
   test 'should archive forum' do
     assert_difference 'Forum.active.count', -1 do
       post archive_admin_forum_url(forums(:one))
-      assert_nil flash[:alert]
+
       assert flash[:notice]
     end
     assert_redirected_to admin_forums_url
   end
 
   test 'should reopen forum' do
     post reopen_admin_forum_url(forums(:one))
-    assert_nil flash[:alert]
+
     assert flash[:notice]
 
     assert_redirected_to admin_forums_url
@@ -81,7 +85,7 @@ class Admin::ForumsControllerTest < ActionDispatch::IntegrationTest
   test 'should destroy forum' do
     assert_difference 'Forum.count', -1 do
       delete admin_forum_url(forums(:two))
-      assert_nil flash[:alert]
+
       assert flash[:notice]
     end
     assert_redirected_to admin_forums_url

test/controllers/admin/friend_sites_controller_test.rb

@@ -9,11 +9,13 @@ class FriendSitesControllerTest < ActionDispatch::IntegrationTest
 
   test 'should list friend sites' do
     get admin_friend_sites_url
+
     assert_response :success
   end
 
   test 'should get new' do
     get new_admin_friend_site_url
+
     assert_response :success
   end
 
@@ -25,7 +27,7 @@ class FriendSitesControllerTest < ActionDispatch::IntegrationTest
           url: 'http://example.com'
         }
       }
-      assert_nil flash[:alert]
+
       assert flash[:notice]
     end
     assert_response :redirect
@@ -38,14 +40,15 @@ class FriendSitesControllerTest < ActionDispatch::IntegrationTest
           url: 'http://example.com'
         }
       }
+
       assert flash[:alert]
-      assert_nil flash[:notice]
     end
     assert_response :success
   end
 
   test 'should get edit' do
     get edit_admin_friend_site_url(friend_sites(:one))
+
     assert_response :success
   end
 
@@ -56,7 +59,7 @@ class FriendSitesControllerTest < ActionDispatch::IntegrationTest
         url: 'http://example.com'
       }
     }
-    assert_nil flash[:alert]
+
     assert flash[:notice]
     assert_response :redirect
   end
@@ -67,35 +70,35 @@ class FriendSitesControllerTest < ActionDispatch::IntegrationTest
         title: ''
       }
     }
+
     assert flash[:alert]
-    assert_nil flash[:notice]
     assert_response :success
   end
 
   test 'should destroy friend site' do
     assert_difference('FriendSite.count', -1) do
       delete admin_friend_site_url(friend_sites(:one))
+
+      assert flash[:notice]
     end
-    assert_nil flash[:alert]
-    assert flash[:notice]
     assert_response :redirect
   end
 
   test 'should lower friend site' do
     assert_difference('friend_sites(:one).reload.position') do
       post lower_admin_friend_site_url(friend_sites(:one))
+
+      assert_nil flash[:alert]
     end
-    assert_nil flash[:alert]
-    assert_nil flash[:notice]
     assert_response :redirect
   end
 
   test 'should higher friend site' do
     assert_no_difference('friend_sites(:one).position') do
       post higher_admin_friend_site_url(friend_sites(:one))
+
+      assert_nil flash[:alert]
     end
-    assert_nil flash[:alert]
-    assert_nil flash[:notice]
     assert_response :redirect
   end
 end

test/controllers/admin/logos_controller_test.rb

@@ -9,13 +9,15 @@ class Admin::LogosControllerTest < ActionDispatch::IntegrationTest
 
   test 'should show logo' do
     get admin_logo_url
+
     assert_response :success
   end
 
   test 'should create logo' do
     post admin_logo_url, params: {
       logo: fixture_file_upload('Logo.png', 'image/png')
     }
+
     assert flash[:notice]
     assert_redirected_to admin_logo_url
   end