#317

backend/spec/requests/tags_spec.rb

@@ -471,54 +471,54 @@ RSpec.describe 'Tags API', type: :request do
         expect(response).to have_http_status(:unprocessable_entity)
         expect(nico_tag.reload.category).to eq('nico')
       end
-    end
 
-    it 'PATCH で tag の name を変更すると対応する wiki version を作成する' do
-      wiki_page =
-          Wiki::Commit.create_content!(
-              tag_name: tag.tag_name,
-              body: 'wiki body before',
-              created_by_user: member_user,
-              message: 'init')
+      it 'PATCH で tag の name を変更すると対応する wiki version を作成する' do
+        wiki_page =
+            Wiki::Commit.create_content!(
+                tag_name: tag.tag_name,
+                body: 'wiki body before',
+                created_by_user: member_user,
+                message: 'init')
 
-      expect {
-        patch "/tags/#{ tag.id }", params: {
-          name: 'patch_wiki_renamed_tag',
+        expect {
+          patch "/tags/#{ tag.id }", params: {
+            name: 'patch_wiki_renamed_tag',
+          }
         }
-      }
-          .to change(TagVersion, :count).by(2)
-          .and change(WikiVersion, :count).by(1)
+            .to change(TagVersion, :count).by(2)
+            .and change(WikiVersion, :count).by(1)
 
-      expect(response).to have_http_status(:ok)
+        expect(response).to have_http_status(:ok)
 
-      version = wiki_page.reload.wiki_versions.order(:version_no).last
+        version = wiki_page.reload.wiki_versions.order(:version_no).last
 
-      expect(version).to have_attributes(
-        event_type: 'update',
-        title: 'patch_wiki_renamed_tag',
-        body: 'wiki body before',
-        created_by_user_id: member_user.id
-      )
-    end
+        expect(version).to have_attributes(
+          event_type: 'update',
+          title: 'patch_wiki_renamed_tag',
+          body: 'wiki body before',
+          created_by_user_id: member_user.id
+        )
+      end
 
-    it 'tag の category だけを変更しても wiki version は作成しない' do
-      wiki_page =
-          Wiki::Commit.create_content!(
-              tag_name: tag.tag_name,
-              body: 'wiki body before',
-              created_by_user: member_user,
-              message: 'init')
+      it 'tag の category だけを変更しても wiki version は作成しない' do
+        wiki_page =
+            Wiki::Commit.create_content!(
+                tag_name: tag.tag_name,
+                body: 'wiki body before',
+                created_by_user: member_user,
+                message: 'init')
 
-      before_count = wiki_page.reload.wiki_versions.count
+        before_wiki_version_count = wiki_page.reload.wiki_versions.count
 
-      expect {
-        patch "/tags/#{ tag.id }", params: {
-          category: 'meme',
-        }
-      }.to change(TagVersion, :count).by(2)
+        expect {
+          patch "/tags/#{ tag.id }", params: {
+            category: 'meme',
+          }
+        }.to change(TagVersion, :count).by(2)
 
-      expect(response).to have_http_status(:ok)
-      expect(wiki_page.reload.wiki_versions.count).to eq(before_count)
+        expect(response).to have_http_status(:ok)
+        expect(wiki_page.reload.wiki_versions.count).to eq(before_wiki_version_count)
+      end
     end
   end
 
@@ -1023,37 +1023,37 @@ RSpec.describe 'Tags API', type: :request do
 
         expect(TagImplication.where(tag:, parent_tag: child)).not_to exist
       end
-    end
 
-    it 'tag の name を変更すると対応する wiki version を作成する' do
-      wiki_page =
-          Wiki::Commit.create_content!(
-              tag_name: tag.tag_name,
-              body: 'wiki body before',
-              created_by_user: member_user,
-              message: 'init')
+      it 'tag の name を変更すると対応する wiki version を作成する' do
+        wiki_page =
+            Wiki::Commit.create_content!(
+                tag_name: tag.tag_name,
+                body: 'wiki body before',
+                created_by_user: member_user,
+                message: 'init')
 
-      expect {
-        put "/tags/#{ tag.id }", params: {
-          name: 'put_wiki_renamed_tag',
-          category: 'general',
-          aliases: 'unko',
-          parent_tags: '',
+        expect {
+          put "/tags/#{ tag.id }", params: {
+            name: 'put_wiki_renamed_tag',
+            category: 'general',
+            aliases: 'unko',
+            parent_tags: '',
+          }
         }
-      }
-          .to change(TagVersion, :count).by(2)
-          .and change(WikiVersion, :count).by(1)
+            .to change(TagVersion, :count).by(2)
+            .and change(WikiVersion, :count).by(1)
 
-      expect(response).to have_http_status(:ok)
+        expect(response).to have_http_status(:ok)
 
-      version = wiki_page.reload.wiki_versions.order(:version_no).last
+        version = wiki_page.reload.wiki_versions.order(:version_no).last
 
-      expect(version).to have_attributes(
-        event_type: 'update',
-        title: 'put_wiki_renamed_tag',
-        body: 'wiki body before',
-        created_by_user_id: member_user.id
-      )
+        expect(version).to have_attributes(
+          event_type: 'update',
+          title: 'put_wiki_renamed_tag',
+          body: 'wiki body before',
+          created_by_user_id: member_user.id
+        )
+      end
     end
   end
 end

backend/spec/requests/wiki_spec.rb

@@ -301,23 +301,22 @@ RSpec.describe 'Wiki API', type: :request do
       end
     end
 
-    # TODO: コンフリクト未実装のため，実装したらコメント外す．
-    # context 'when conflict' do
-    #   it 'returns 409 when base_revision_id mismatches' do
-    #     # 先に別ユーザ（同じ member でもOK）が 1 回更新して先頭を進める
-    #     Wiki::Commit.content!(page: page, body: "zzz", created_user: member, message: 'other edit')
-    #     page.reload
+    context 'when conflict' do
+      it 'returns 409 when base_revision_id mismatches' do
+        # 先に別ユーザ（同じ member でもOK）が 1 回更新して先頭を進める
+        Wiki::Commit.content!(page: page, body: "zzz", created_user: member, message: 'other edit')
+        page.reload
 
-    #     stale_id = page.wiki_revisions.order(:id).first.id # わざと古い id
-    #     put "/wiki/#{page.id}",
-    #         params: { title: 'TestPage', body: 'x', base_revision_id: stale_id },
-    #         headers: auth_headers(member)
+        stale_id = page.wiki_revisions.order(:id).first.id # わざと古い id
+        put "/wiki/#{page.id}",
+            params: { title: 'TestPage', body: 'x', base_revision_id: stale_id },
+            headers: auth_headers(member)
 
-    #     expect(response).to have_http_status(:conflict)
-    #     json = JSON.parse(response.body)
-    #     expect(json['error']).to eq('conflict')
-    #   end
-    # end
+        expect(response).to have_http_status(:conflict)
+        json = JSON.parse(response.body)
+        expect(json['error']).to eq('conflict')
+      end
+    end
 
     context 'when page not found' do
       it 'returns 404' do
@@ -520,76 +519,6 @@ RSpec.describe 'Wiki API', type: :request do
     end
   end
 
-  it 'wiki title を変更すると対応する tag の version を作成する' do
-    linked_tag_name = TagName.create!(name: 'wiki_linked_tag_for_version')
-    linked_tag = Tag.create!(tag_name: linked_tag_name, category: :general)
-
-    linked_page =
-        Wiki::Commit.create_content!(
-            tag_name: linked_tag_name,
-            body: 'before',
-            created_by_user: user,
-            message: 'init')
-
-    current_id = linked_page.current_revision.id
-
-    expect {
-      put "/wiki/#{ linked_page.id }",
-          params: {
-            title: 'wiki_linked_tag_for_version_renamed',
-            body: 'after',
-            message: 'edit',
-            base_revision_id: current_id,
-          },
-          headers: auth_headers(member)
-    }
-        .to change(WikiRevision, :count).by(1)
-        .and change(WikiVersion, :count).by(1)
-        .and change { linked_tag.reload.tag_versions.count }.by(2)
-
-    expect(response).to have_http_status(:ok)
-
-    linked_tag.reload
-    expect(linked_tag.name).to eq('wiki_linked_tag_for_version_renamed')
-
-    versions = linked_tag.tag_versions.order(:version_no)
-
-    expect(versions.first.event_type).to eq('create')
-    expect(versions.first.name).to eq('wiki_linked_tag_for_version')
-
-    expect(versions.second.event_type).to eq('update')
-    expect(versions.second.name).to eq('wiki_linked_tag_for_version_renamed')
-  end
-
-  it 'wiki body だけを変更しても tag version は作成しない' do
-    linked_tag_name = TagName.create!(name: 'wiki_body_only_tag')
-    linked_tag = Tag.create!(tag_name: linked_tag_name, category: :general)
-
-    linked_page =
-        Wiki::Commit.create_content!(
-            tag_name: linked_tag_name,
-            body: 'before',
-            created_by_user: user,
-            message: 'init')
-
-    current_id = linked_page.current_revision.id
-
-    expect {
-      put "/wiki/#{ linked_page.id }",
-          params: {
-            title: 'wiki_body_only_tag',
-            body: 'after',
-            message: 'edit',
-            base_revision_id: current_id,
-          },
-          headers: auth_headers(member)
-    }
-        .to change(WikiRevision, :count).by(1)
-        .and change(WikiVersion, :count).by(1)
-
-    expect(linked_tag.reload.tag_versions.count).to eq(0)
-  end
-
   it 'wiki title を変更すると対応する tag の version を作成する' do
     linked_tag_name = TagName.create!(name: 'wiki_linked_tag_for_version')
     linked_tag = Tag.create!(tag_name: linked_tag_name, category: :general)