- <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 7be2ca840..d5ad09293 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -241,16 +241,8 @@ Rails.application.routes.draw do
get :autocomplete
end
end
- resources :tag_aliases do
- member do
- post :approve
- end
- end
- resources :tag_implications do
- member do
- post :approve
- end
- end
+ resources :tag_aliases, only: [:show, :index, :destroy]
+ resources :tag_implications, only: [:show, :index, :destroy]
resources :uploads do
collection do
post :preprocess
diff --git a/test/functional/tag_aliases_controller_test.rb b/test/functional/tag_aliases_controller_test.rb
index 1805ca893..540e253eb 100644
--- a/test/functional/tag_aliases_controller_test.rb
+++ b/test/functional/tag_aliases_controller_test.rb
@@ -7,50 +7,6 @@ class TagAliasesControllerTest < ActionDispatch::IntegrationTest
@tag_alias = create(:tag_alias, antecedent_name: "aaa", consequent_name: "bbb")
end
- context "edit action" do
- should "render" do
- get_auth edit_tag_alias_path(@tag_alias), @user
- assert_response :success
- end
- end
-
- context "update action" do
- context "for a pending alias" do
- setup do
- as_admin do
- @tag_alias.update(status: "pending")
- end
- end
-
- should "succeed" do
- put_auth tag_alias_path(@tag_alias), @user, params: {:tag_alias => {:antecedent_name => "xxx"}}
- @tag_alias.reload
- assert_equal("xxx", @tag_alias.antecedent_name)
- end
-
- should "not allow changing the status" do
- put_auth tag_alias_path(@tag_alias), @user, params: {:tag_alias => {:status => "active"}}
- @tag_alias.reload
- assert_equal("pending", @tag_alias.status)
- end
-
- # TODO: Broken in shoulda-matchers 2.8.0. Need to upgrade to 3.1.1.
- # should_eventually permit(:antecedent_name, :consequent_name, :forum_topic_id).for(:update)
- end
-
- context "for an approved alias" do
- setup do
- @tag_alias.update_attribute(:status, "approved")
- end
-
- should "fail" do
- put_auth tag_alias_path(@tag_alias), @user, params: {:tag_alias => {:antecedent_name => "xxx"}}
- @tag_alias.reload
- assert_equal("aaa", @tag_alias.antecedent_name)
- end
- end
- end
-
context "index action" do
should "list all tag alias" do
get_auth tag_aliases_path, @user
diff --git a/test/functional/tag_implications_controller_test.rb b/test/functional/tag_implications_controller_test.rb
index 81b024837..29dd4dd05 100644
--- a/test/functional/tag_implications_controller_test.rb
+++ b/test/functional/tag_implications_controller_test.rb
@@ -7,47 +7,6 @@ class TagImplicationsControllerTest < ActionDispatch::IntegrationTest
@tag_implication = create(:tag_implication, antecedent_name: "aaa", consequent_name: "bbb")
end
- context "edit action" do
- should "render" do
- get_auth tag_implication_path(@tag_implication), @user
- assert_response :success
- end
- end
-
- context "update action" do
- context "for a pending implication" do
- setup do
- as_admin do
- @tag_implication.update(status: "pending")
- end
- end
-
- should "succeed" do
- put_auth tag_implication_path(@tag_implication), @user, params: {:tag_implication => {:antecedent_name => "xxx"}}
- @tag_implication.reload
- assert_equal("xxx", @tag_implication.antecedent_name)
- end
-
- should "not allow changing the status" do
- put_auth tag_implication_path(@tag_implication), @user, params: {:tag_implication => {:status => "active"}}
- @tag_implication.reload
- assert_equal("pending", @tag_implication.status)
- end
- end
-
- context "for an approved implication" do
- setup do
- @tag_implication.update_attribute(:status, "approved")
- end
-
- should "fail" do
- put_auth tag_implication_path(@tag_implication), @user, params: {:tag_implication => {:antecedent_name => "xxx"}}
- @tag_implication.reload
- assert_equal("aaa", @tag_implication.antecedent_name)
- end
- end
- end
-
context "index action" do
should "list all tag implications" do
get tag_implications_path