Merge pull request #5189 from nebulab/ryanofwoods/fix-taxon-taxonomy_…

…id-validation

Fix Taxon taxonomy id validation regression

core/app/models/spree/taxon.rb

@@ -22,7 +22,7 @@ class Taxon < Spree::Base
     validates :meta_keywords, length: { maximum: 255 }
     validates :meta_description, length: { maximum: 255 }
     validates :meta_title, length: { maximum: 255 }
-    validates :taxonomy_id, uniqueness: { message: :can_have_only_one_root }, if: -> { root? }
+    validates :taxonomy_id, uniqueness: { scope: :parent_id, message: :can_have_only_one_root }, if: -> { root? }
 
     after_save :touch_ancestors_and_taxonomy
     after_touch :touch_ancestors_and_taxonomy

core/spec/models/spree/taxon_spec.rb

@@ -194,16 +194,27 @@
   context "validations" do
     context "taxonomy_id validations" do
       let(:taxonomy) { create(:taxonomy) }
-      let(:taxon) { taxonomy.taxons.create(name: 'New node') }
 
       it "ensures that only one root can be created" do
+        taxon = taxonomy.taxons.create(name: 'New node')
         expect(taxon).to be_invalid
         expect(taxon.errors.full_messages).to match_array(["Taxonomy can only have one root Taxon"])
       end
 
-      it "allows for multiple taxons under taxonomy" do
-        expect(taxon.update(parent_id: taxonomy.root.id)).to eq(true)
+      it "allows for multiple taxons under a taxonomy" do
+        taxon = taxonomy.root.children.create!(name: 'First child', taxonomy: taxonomy)
+        expect(taxon).to be_valid
         expect(taxonomy.taxons.many?).to eq(true)
+        second_taxon = taxonomy.root.children.create!(name: 'Second child', taxonomy: taxonomy)
+        expect(second_taxon).to be_valid
+        expect(taxonomy.root.children.many?).to eq(true)
+      end
+
+      # Regression test https://github.com/solidusio/solidus/issues/5187
+      it "does not invalidate the root taxon after having children taxons" do
+        taxonomy.root.children.create!(name: 'New node', taxonomy: taxonomy)
+        expect(taxonomy.taxons.many?).to eq(true)
+        expect(taxonomy.root).to be_valid
       end
     end