Merge pull request #18378 from yrudman/fixed-saving-tag-name

Fixed saving edited tag name

app/models/classification.rb

@@ -529,7 +529,11 @@ def find_tag
 
   def save_tag
     tag_name = Classification.name2tag(name, parent_id, ns)
-    self.tag = Tag.in_region(region_id).find_or_create_by(:name => tag_name)
+    if tag.present?
+      tag.update_attributes(:name => tag_name)
+    else
+      self.tag = Tag.in_region(region_id).find_or_create_by(:name => tag_name)
+    end
   end
 
   def delete_all_entries

spec/models/classification_spec.rb

@@ -571,6 +571,31 @@
     end
   end
 
+  describe '#save' do
+    let(:new_name) { "new_tag_name" }
+
+    context "editing existing tag" do
+      it "updates record in Tag table which linked to this classification" do
+        classification = FactoryBot.create(:classification_tag, :name => "some_tag_name")
+        tag = classification.tag
+        classification.name = new_name
+        classification.save
+        expect(tag.id).to eq classification.tag.id
+        expect(classification.tag.name).to eq(Classification.name2tag(new_name))
+      end
+    end
+
+    context "saving new tag" do
+      it "creates new record in Tag table and links it to this classification" do
+        classification = Classification.new
+        classification.description = "some description"
+        classification.name = new_name
+        classification.save
+        expect(classification.tag).to eq(Tag.last)
+      end
+    end
+  end
+
   def all_tagged_with(target, all, category = nil)
     tagged_with(target, :all => all, :cat => category)
   end