コミットを比較

..
2 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker 8f7e6dbcb7 AI: address review on PR #464 2026-11-13 12:44:52 +09:00
Codex Night Worker 5528453a54 AI: address issue #446 2026-11-12 21:12:53 +09:00
4個のファイルの変更、37行の追加、43行の削除
+5 -2
ファイルの表示
@@ -69,8 +69,11 @@ class TagVersionsController < ApplicationController
parent_tags = parent_tags =
build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id) build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id)
.map do |h| .filter_map do |h|
{ tag: parent_json.fetch(h[:tag_id]), parent = parent_json[h[:tag_id]]
next unless parent
{ tag: parent,
type: h[:type] } type: h[:type] }
end end
+30
ファイルの表示
@@ -215,6 +215,36 @@ RSpec.describe 'TagVersions API', type: :request do
expect(first.fetch('created_at')).to eq(t_v1.iso8601) expect(first.fetch('created_at')).to eq(t_v1.iso8601)
end end
[:parent_shared, :parent_new, :parent_old].each do |parent_key|
it "omits deleted #{ parent_key } from parent diffs" do
deleted_parent = public_send(parent_key)
deleted_parent.tag_names.destroy_all
deleted_parent.destroy!
get '/tags/versions', params: { id: tag.id }
expect(response).to have_http_status(:ok)
expect(json.fetch('count')).to eq(2)
versions = json.fetch('versions')
expect(versions.map { _1.fetch('version_no') }).to eq([2, 1])
expected_parents = [
[parent_shared.id, 'context'],
[parent_new.id, 'added'],
[parent_old.id, 'removed']].reject { _1.first == deleted_parent.id }
expect(versions.first.fetch('parent_tags').map { |entry|
[entry.fetch('tag').fetch('id'), entry.fetch('type')]
}).to eq(expected_parents)
expected_first_parents = [parent_shared.id, parent_old.id]
.reject { _1 == deleted_parent.id }.map { [_1, 'added'] }
expect(versions.second.fetch('parent_tags').map { |entry|
[entry.fetch('tag').fetch('id'), entry.fetch('type')]
}).to eq(expected_first_parents)
end
end
it 'returns empty when the specified tag has no versions' do it 'returns empty when the specified tag has no versions' do
fresh_tag = create(:tag, primary_name: 'no_versions_tag', category: :general) fresh_tag = create(:tag, primary_name: 'no_versions_tag', category: :general)
-21
ファイルの表示
@@ -2,7 +2,6 @@ import assert from 'node:assert/strict'
import { createServer } from 'node:http' import { createServer } from 'node:http'
import { spawn } from 'node:child_process' import { spawn } from 'node:child_process'
import { after, before, test } from 'node:test' import { after, before, test } from 'node:test'
import { JSDOM } from 'jsdom'
import { createServer as createViteServer } from 'vite' import { createServer as createViteServer } from 'vite'
import { render } from './dist/server/entry-server.js' import { render } from './dist/server/entry-server.js'
@@ -403,26 +402,6 @@ test ('every canonical screen route returns page HTML without JavaScript', async
} }
}) })
test ('SSR HTML head includes reciprocal hreflang links with query parameters', async () => {
for (const locale of ['ja', 'ain-Kana']) {
const response = await fetch (`${httpOrigin}/${locale}/posts?page=2&limit=50`)
assert.equal (response.status, 200)
const dom = new JSDOM (await response.text ())
try
{
const links = [...dom.window.document.head.querySelectorAll ('link[rel="alternate"]')]
assert.deepEqual (links.map (link => ({
locale: link.getAttribute ('hreflang'), href: link.getAttribute ('href') })), [
{ locale: 'ja', href: `${origin}/ja/posts?page=2&limit=50` },
{ locale: 'ain-Kana', href: `${origin}/ain-Kana/posts?page=2&limit=50` }])
}
finally
{
dom.window.close ()
}
}
})
test ('YouTube posts return HTTP 200 with the embed rendered by SSR', async t => { test ('YouTube posts return HTTP 200 with the embed rendered by SSR', async t => {
for (const locale of ['ja', 'ain-Kana']) { for (const locale of ['ja', 'ain-Kana']) {
await t.test (locale, async () => { await t.test (locale, async () => {
+2 -20
ファイルの表示
@@ -1,6 +1,6 @@
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query' import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
import { PassThrough } from 'node:stream' import { PassThrough } from 'node:stream'
import { renderToPipeableStream, renderToStaticMarkup } from 'react-dom/server' import { renderToPipeableStream } from 'react-dom/server'
import { HelmetProvider } from 'react-helmet-async' import { HelmetProvider } from 'react-helmet-async'
import { I18nextProvider } from 'react-i18next' import { I18nextProvider } from 'react-i18next'
import { createStaticHandler, createStaticRouter, import { createStaticHandler, createStaticRouter,
@@ -9,7 +9,7 @@ import { createStaticHandler, createStaticRouter,
import { AppFrame, appRoutes, resolvePageRoute } from '@/App' import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
import { apiGet, isApiError } from '@/lib/api' import { apiGet, isApiError } from '@/lib/api'
import { createUII18n } from '@/lib/i18n' import { createUII18n } from '@/lib/i18n'
import { fetchLocales, isLocaleCode, legacyLocalePath, switchLocalePath } from '@/lib/locales' import { fetchLocales, isLocaleCode, legacyLocalePath } from '@/lib/locales'
import { localesKeys, sessionKeys } from '@/lib/queryKeys' import { localesKeys, sessionKeys } from '@/lib/queryKeys'
import { withRenderContext } from '@/lib/renderContext.server' import { withRenderContext } from '@/lib/renderContext.server'
@@ -171,26 +171,8 @@ export const render = async (
})) }))
} }
const helmet = helmetContext.helmet! const helmet = helmetContext.helmet!
const alternates = status === 200 && known != null
? await Promise.all (locales.locales.map (entry => entry.code)
.filter (isLocaleCode)
.filter (code => known.route.handle?.locale == null
|| known.route.handle.locale === code)
.map (async targetLocale => {
const location = { pathname: url.pathname, search: url.search, hash: '' }
const path = targetLocale === locale
? url.pathname + url.search
: (known.route.handle?.switchLocale != null
? await known.route.handle.switchLocale ({
location, params: known.params, locale, targetLocale })
: switchLocalePath (location, targetLocale))
return <link key={targetLocale} rel="alternate" hrefLang={targetLocale}
href={new URL (path, origin).href}/>
}))
: []
const head = [helmet.title, helmet.meta, helmet.link, helmet.style] const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
.map (entry => entry.toString ()).join ('') .map (entry => entry.toString ()).join ('')
+ renderToStaticMarkup (<>{alternates}</>)
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query => const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
query.state.status !== 'pending' query.state.status !== 'pending'
&& query.meta?.clientOnly !== true && query.meta?.clientOnly !== true