diff --git a/test/functional/artists_controller_test.rb b/test/functional/artists_controller_test.rb
index 48893579c..0ce937bee 100644
--- a/test/functional/artists_controller_test.rb
+++ b/test/functional/artists_controller_test.rb
@@ -18,13 +18,13 @@ class ArtistsControllerTest < ActionController::TestCase
 
   context "An artists controller" do
     setup do
-      CurrentUser.user = FactoryGirl.create(:user)
+      @user = FactoryGirl.create(:user)
+      CurrentUser.user = @user
       CurrentUser.ip_addr = "127.0.0.1"
       @artist = FactoryGirl.create(:artist)
-      @user = FactoryGirl.create(:user)
 
-      FactoryGirl.create(:artist, :name => "masao",   :url_string => "http://i2.pixiv.net/img04/img/syounen_no_uta/")
-      FactoryGirl.create(:artist, :name => "artgerm", :url_string => "http://artgerm.deviantart.com/")
+      @masao = FactoryGirl.create(:artist, :name => "masao",   :url_string => "http://i2.pixiv.net/img04/img/syounen_no_uta/")
+      @artgerm = FactoryGirl.create(:artist, :name => "artgerm", :url_string => "http://artgerm.deviantart.com/")
     end
 
     teardown do
@@ -37,6 +37,14 @@ class ArtistsControllerTest < ActionController::TestCase
       assert_response :success
     end
 
+    should "get the show_or_new page" do
+      get :show_or_new, { name: "masao" }, { user_id: @user.id }
+      assert_redirected_to(@masao)
+
+      get :show_or_new, { name: "nobody" }, { user_id: @user.id }
+      assert_redirected_to(new_artist_path(name: "nobody"))
+    end
+
     should "get the edit page" do
       get :edit, {:id => @artist.id}, {:user_id => @user.id}
       assert_response :success
@@ -53,6 +61,32 @@ class ArtistsControllerTest < ActionController::TestCase
       assert_response :success
     end
 
+    should "get the banned page" do
+      get :banned
+      assert_response :success
+    end
+
+    should "ban an artist" do
+      CurrentUser.scoped(FactoryGirl.create(:admin_user)) do
+        put :ban, { id: @artist.id }, { user_id: CurrentUser.id }
+      end
+
+      assert_redirected_to(@artist)
+      assert_equal(true, @artist.reload.is_banned)
+      assert_equal(true, TagImplication.exists?(antecedent_name: @artist.name, consequent_name: "banned_artist"))
+    end
+
+    should "unban an artist" do
+      CurrentUser.scoped(FactoryGirl.create(:admin_user)) do
+        @artist.ban!
+        put :unban, { id: @artist.id }, { user_id: CurrentUser.id }
+      end
+
+      assert_redirected_to(@artist)
+      assert_equal(false, @artist.reload.is_banned)
+      assert_equal(false, TagImplication.exists?(antecedent_name: @artist.name, consequent_name: "banned_artist"))
+    end
+
     should "get the index page" do
       get :index
       assert_response :success
@@ -102,6 +136,24 @@ class ArtistsControllerTest < ActionController::TestCase
       assert_redirected_to(artist_path(@artist))
     end
 
+    should "delete an artist" do
+      CurrentUser.scoped(FactoryGirl.create(:builder_user)) do
+        delete :destroy, { id: @artist.id }, { user_id: CurrentUser.id }
+      end
+
+      assert_redirected_to(artist_path(@artist))
+      assert_equal(false, @artist.reload.is_active)
+    end
+
+    should "undelete an artist" do
+      CurrentUser.scoped(FactoryGirl.create(:builder_user)) do
+        put :undelete, { id: @artist.id }, { user_id: CurrentUser.id }
+      end
+
+      assert_redirected_to(artist_path(@artist))
+      assert_equal(true, @artist.reload.is_active)
+    end
+
     context "when renaming an artist" do
       should "automatically rename the artist's wiki page" do
         artist = FactoryGirl.create(:artist, :name => "aaa", :notes => "testing")