fixing taggable controller

app/controllers/concerns/taggable_controller.rb

@@ -3,25 +3,26 @@ module TaggableController
 
   included do
     before_action :authenticate_user!, only: [:tagging, :untagging]
+    before_action :set_user_tags, only: [:tagging, :untagging]
   end
 
   # POST /v1/learning_objects/1/tagging
   # POST /v1/learning_objects/1/tagging.json
   def tagging
-    if current_user.tag(taggable, with: taggable.owner_tags_on(current_user, :tags) << tag_params[:name], on: :tags)
-      render json: @taggable, status: :created
+    if current_user.tag(taggable, with: @user_tags << tag_params[:name], on: :tags)
+      render json: taggable, status: :created
     else
-      render json: @taggable.errors, status: :unprocessable_entity
+      render json: taggable.errors, status: :unprocessable_entity
     end
   end
 
   # DELETE /v1/learning_objects/1/untagging
   # DELETE /v1/learning_objects/1/untagging.json
   def untagging
-    if current_user.tag(taggable, with: taggable.owner_tags_on(current_user, :tags).delete(tag_params[:name]), on: :tags)
-      render json: @taggable, status: :ok
+    if current_user.tag(taggable, with: @user_tags.delete(params[:name]), on: :tags)
+      render json: taggable, status: :ok
     else
-      render json: @taggable.errors, status: :unprocessable_entity
+      render json: taggable.errors, status: :unprocessable_entity
     end
   end
 
@@ -34,4 +35,8 @@ module TaggableController
   def tag_params
     params.require(:tag).permit(:name)
   end
+
+  def set_user_tags
+    @user_tags = taggable.owner_tags_on(current_user, :tags)
+  end
 end

test/controllers/v1/collections_controller_test.rb

@@ -60,7 +60,7 @@ class V1::CollectionsControllerTest < ActionController::TestCase
     auth_request users(:john)
 
     delete :untagging, id: collections(:ufpr).id, tag: { name: 'Test' }
-    assertok_response :unprocessable_entity
+    assert_response :unprocessable_entity
   end
 
   test 'should user untagging a tag that does not exist' do
@@ -70,7 +70,7 @@ class V1::CollectionsControllerTest < ActionController::TestCase
     assert_response :created
 
     delete :untagging, id: collections(:ufpr).id, tag: { name: 'Test2' }
-    assertok_response :unprocessable_entity
+    assert_response :unprocessable_entity
   end
 
   private