#428

backend/spec/requests/locale_write_paths_spec.rb

@@ -153,11 +153,14 @@ RSpec.describe 'Locale propagation on write paths', type: :request do
     let(:ainu_name) do
       create(:tag_name, name: 'shared_name', language_code: 'ain', script_code: 'Kana')
     end
-    let(:ainu_tag) { create(:tag, primary_tag_name: ainu_name, category: :material) }
+    let(:ainu_tag) do
+      create(:tag, primary_tag_name: ainu_name, category: :material).tap do |tag|
+        primary_tag_name_for(tag, 'ja').update!(name: 'ainu_in_japanese', auto_generated: false)
+      end
+    end
     let(:nipponese_tag) do
       create(:tag, primary_name: 'temporary_nipponese', category: :general).tap do |tag|
-        # Isolate lookup from the separately tested uniqueness validation.
-        primary_tag_name_for(tag, 'ja').update_columns(name: 'shared_name')
+        primary_tag_name_for(tag, 'ja').update!(name: 'shared_name')
       end
     end
 
@@ -291,6 +294,8 @@ RSpec.describe 'Locale propagation on write paths', type: :request do
     it 'allows a rename to a name already used in Nipponese' do
       locale
       nipponese = create(:tag, primary_name: 'rename_target')
+      primary_tag_name_for(nipponese, 'ain').update!(
+          name: 'different_ainu_target', auto_generated: false)
 
       patch "/tags/#{ tag.id }", params: { locale: 'ain-Kana', name: 'rename_target' }
 

backend/spec/requests/posts_spec.rb

@@ -2323,8 +2323,10 @@ RSpec.describe 'Posts API', type: :request do
         'prev' => nil
       )
       expect(latest.fetch('tags')).to include(
-        { 'name' => 'spec_tag_2', 'type' => 'added' },
-        { 'name' => 'spec_tag', 'type' => 'removed' }
+        { 'name' => 'spec_tag_2', 'restore_name' => 'spec_tag_2',
+          'external' => false, 'type' => 'added' },
+        { 'name' => 'spec_tag', 'restore_name' => 'spec_tag',
+          'external' => false, 'type' => 'removed' }
       )
       expect(latest.fetch('original_created_from')).to eq(
         'current' => oc_from.iso8601,
@@ -2351,7 +2353,8 @@ RSpec.describe 'Posts API', type: :request do
         'prev' => nil
       )
       expect(first.fetch('tags')).to include(
-        { 'name' => 'spec_tag', 'type' => 'added' }
+        { 'name' => 'spec_tag', 'restore_name' => 'spec_tag',
+          'external' => false, 'type' => 'added' }
       )
       expect(first.fetch('created_at')).to eq(t_v1.iso8601)
     end
@@ -2435,7 +2438,9 @@ RSpec.describe 'Posts API', type: :request do
       expect(response).to have_http_status(:ok)
       expect(json.fetch('count')).to eq(3)
       expect(json.fetch('versions').first.fetch('tags')).to include(
-          'name' => primary_tag_name_for(tag2, 'ja').name, 'type' => 'context')
+          'name' => primary_tag_name_for(tag2, 'ja').name,
+          'restore_name' => primary_tag_name_for(tag2, 'ja').name,
+          'external' => false, 'type' => 'context')
     end
 
     it 'filters versions by tag when the current snapshot includes the tag' do
@@ -2449,7 +2454,8 @@ RSpec.describe 'Posts API', type: :request do
       expect(versions[0]['post_id']).to eq(post_record.id)
       expect(versions[0]['version_no']).to eq(2)
       expect(versions[0]['tags']).to include(
-        { 'name' => 'spec_tag_2', 'type' => 'added' }
+        { 'name' => 'spec_tag_2', 'restore_name' => 'spec_tag_2',
+          'external' => false, 'type' => 'added' }
       )
     end
 
@@ -2467,10 +2473,12 @@ RSpec.describe 'Posts API', type: :request do
       first = versions[1]
 
       expect(latest['tags']).to include(
-        { 'name' => 'spec_tag', 'type' => 'removed' }
+        { 'name' => 'spec_tag', 'restore_name' => 'spec_tag',
+          'external' => false, 'type' => 'removed' }
       )
       expect(first['tags']).to include(
-        { 'name' => 'spec_tag', 'type' => 'added' }
+        { 'name' => 'spec_tag', 'restore_name' => 'spec_tag',
+          'external' => false, 'type' => 'added' }
       )
     end