コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
820e4ac828 | ||
|
|
e13a52db9a |
@@ -69,11 +69,8 @@ class TagVersionsController < ApplicationController
|
||||
|
||||
parent_tags =
|
||||
build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id)
|
||||
.filter_map do |h|
|
||||
parent = parent_json[h[:tag_id]]
|
||||
next unless parent
|
||||
|
||||
{ tag: parent,
|
||||
.map do |h|
|
||||
{ tag: parent_json.fetch(h[:tag_id]),
|
||||
type: h[:type] }
|
||||
end
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
class AddPostCountIndexToTags < ActiveRecord::Migration[8.0]
|
||||
def change
|
||||
add_index :tags, :post_count
|
||||
end
|
||||
end
|
||||
生成ファイル
+2
-1
@@ -10,7 +10,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
|
||||
ActiveRecord::Schema[8.0].define(version: 2026_11_15_000000) do
|
||||
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.string "name", null: false
|
||||
t.string "record_type", null: false
|
||||
@@ -630,6 +630,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
|
||||
t.integer "post_count", default: 0, null: false
|
||||
t.integer "version_no", null: false
|
||||
t.index ["deprecated_at"], name: "index_tags_on_deprecated_at"
|
||||
t.index ["post_count"], name: "index_tags_on_post_count"
|
||||
t.check_constraint "(`deprecated_at` is null) or (`category` <> _utf8mb4'nico')", name: "chk_tags_deprecated_at_not_nico"
|
||||
t.check_constraint "`version_no` > 0", name: "chk_tags_version_no_positive"
|
||||
end
|
||||
|
||||
@@ -2,6 +2,19 @@ require 'rails_helper'
|
||||
|
||||
RSpec.describe Tag, type: :model do
|
||||
include WikiRecords
|
||||
|
||||
describe 'post_count index' do
|
||||
it 'has a non-unique index on post_count alone' do
|
||||
indexes = described_class.connection.indexes(described_class.table_name)
|
||||
|
||||
expect(indexes).to include(
|
||||
have_attributes(
|
||||
name: 'index_tags_on_post_count',
|
||||
columns: ['post_count'],
|
||||
unique: false))
|
||||
end
|
||||
end
|
||||
|
||||
describe '#has_description?' do
|
||||
let(:tag) { create(:tag) }
|
||||
|
||||
|
||||
@@ -215,36 +215,6 @@ RSpec.describe 'TagVersions API', type: :request do
|
||||
expect(first.fetch('created_at')).to eq(t_v1.iso8601)
|
||||
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
|
||||
fresh_tag = create(:tag, primary_name: 'no_versions_tag', category: :general)
|
||||
|
||||
|
||||
@@ -70,6 +70,16 @@ describe ('SidebarComponent', () => {
|
||||
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
|
||||
})
|
||||
|
||||
it ('limits sidebar scrolling to desktop to avoid clipping mobile suggestions', () => {
|
||||
renderSidebar ()
|
||||
|
||||
// jsdom has no layout; guard the responsive classes responsible for clipping.
|
||||
const sidebar = screen.getByText ('Sidebar body')
|
||||
|
||||
expect (sidebar).not.toHaveClass ('overflow-y-auto')
|
||||
expect (sidebar).toHaveClass ('md:overflow-y-auto')
|
||||
})
|
||||
|
||||
it ('uses maxWidth without applying the container main-width reserve twice', async () => {
|
||||
localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
|
||||
const onWidthChange = vi.fn ()
|
||||
|
||||
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
|
||||
</style>
|
||||
</Helmet>
|
||||
|
||||
<div className="h-full overflow-y-auto p-4 sidebar">
|
||||
<div className="h-full md:overflow-y-auto p-4 sidebar">
|
||||
{children}
|
||||
</div>
|
||||
|
||||
|
||||
@@ -35,6 +35,10 @@ const renderPage = () =>
|
||||
describe ('TagDetailPage', () => {
|
||||
beforeEach (() => {
|
||||
vi.clearAllMocks ()
|
||||
tagsApi.fetchTag.mockReset ()
|
||||
api.apiPut.mockReset ()
|
||||
api.isApiError.mockReset ()
|
||||
toastApi.toast.mockReset ()
|
||||
api.isApiError.mockReturnValue (false)
|
||||
})
|
||||
|
||||
@@ -51,8 +55,11 @@ describe ('TagDetailPage', () => {
|
||||
})
|
||||
|
||||
it ('submits edited tag fields', async () => {
|
||||
tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
||||
api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
|
||||
const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
|
||||
tagsApi.fetchTag
|
||||
.mockResolvedValue (updatedTag)
|
||||
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
||||
api.apiPut.mockResolvedValueOnce (updatedTag)
|
||||
|
||||
renderPage ()
|
||||
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする