#55

backend/spec/models/locale_spec.rb

@@ -27,10 +27,10 @@ RSpec.describe Locale, type: :model do
     expect(first.tag_names.find_by!(language_code: 'fr', primary_flg: true))
         .to have_attributes(name: 'name_from_generator', tag_id: first.id,
                             language_code: 'fr', script_code: 'Latn',
-                            primary_flg: true, canonical_id: nil)
+                            primary_flg: true)
     expect(second.tag_names.find_by!(language_code: 'fr', primary_flg: true))
         .to have_attributes(tag_id: second.id, language_code: 'fr',
-                            script_code: 'Latn', primary_flg: true, canonical_id: nil)
+                            script_code: 'Latn', primary_flg: true)
     expect(TagName.where(language_code: 'fr', primary_flg: true,
                          tag_id: [first.id, second.id]).count).to eq(2)
   end
@@ -53,13 +53,13 @@ RSpec.describe Locale, type: :model do
     prepare_french_reference!
     tag = create(:tag, name: 'alias_only_tag')
     alias_name = create(:tag_name, :alias, name: 'alias_fr',
-                                          canonical: tag.tag_name,
+                                          tag:,
                                           language_code: 'fr', script_code: 'Latn')
 
     create_french_locale!
 
     expect(alias_name.reload).to have_attributes(
-        canonical_id: tag.tag_name_id, tag_id: tag.id,
+        tag_id: tag.id,
         language_code: 'fr', script_code: 'Latn', primary_flg: false)
     generated = TagName.find_by!(tag_id: tag.id, language_code: 'fr', primary_flg: true)
     expect(generated).to have_attributes(tag_id: tag.id, language_code: 'fr',