コミットを比較
5
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
24ccdae1c9 | ||
|
|
3663af3f48 | ||
|
|
97e44b84f8 | ||
|
|
1627450835 | ||
|
|
ab0e28576d |
@@ -8,7 +8,6 @@ class PostImplication < ApplicationRecord
|
|||||||
validates :parent_post_id, presence: true
|
validates :parent_post_id, presence: true
|
||||||
|
|
||||||
validate :parent_post_mustnt_be_itself
|
validate :parent_post_mustnt_be_itself
|
||||||
validate :parent_post_mustnt_create_cycle
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
@@ -17,24 +16,4 @@ class PostImplication < ApplicationRecord
|
|||||||
errors.add :parent_post_id, '親投稿に同じ投稿を設定することはできません.'
|
errors.add :parent_post_id, '親投稿に同じ投稿を設定することはできません.'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def parent_post_mustnt_create_cycle
|
|
||||||
return if post_id.blank? || parent_post_id.blank?
|
|
||||||
return if errors[:parent_post_id].present?
|
|
||||||
|
|
||||||
ancestor_ids = Set.new
|
|
||||||
frontier_ids = [parent_post_id]
|
|
||||||
|
|
||||||
until frontier_ids.empty?
|
|
||||||
if frontier_ids.include?(post_id)
|
|
||||||
errors.add :parent_post_id, :invalid
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
ancestor_ids.merge(frontier_ids)
|
|
||||||
frontier_ids = PostImplication.where(post_id: frontier_ids)
|
|
||||||
.distinct.pluck(:parent_post_id)
|
|
||||||
.reject { ancestor_ids.include?(_1) }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -48,47 +48,4 @@ RSpec.describe PostImplication, type: :model do
|
|||||||
expect(duplicate).not_to be_valid
|
expect(duplicate).not_to be_valid
|
||||||
expect(duplicate.errors[:post_id]).to be_present
|
expect(duplicate.errors[:post_id]).to be_present
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'rejects a parent that would create a two-post cycle' do
|
|
||||||
described_class.create!(post: post_record, parent_post:)
|
|
||||||
|
|
||||||
implication = described_class.new(
|
|
||||||
post: parent_post, parent_post: post_record)
|
|
||||||
|
|
||||||
expect(implication).not_to be_valid
|
|
||||||
expect(implication.errors.of_kind?(:parent_post_id, :invalid)).to be true
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rejects a parent that would create a three-post cycle' do
|
|
||||||
ancestor_post = create(:post)
|
|
||||||
described_class.create!(post: post_record, parent_post:)
|
|
||||||
described_class.create!(post: parent_post, parent_post: ancestor_post)
|
|
||||||
|
|
||||||
implication = described_class.new(
|
|
||||||
post: ancestor_post, parent_post: post_record)
|
|
||||||
|
|
||||||
expect(implication).not_to be_valid
|
|
||||||
expect(implication.errors.of_kind?(:parent_post_id, :invalid)).to be true
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'allows a parent with an ancestor when no cycle would result' do
|
|
||||||
ancestor_post = create(:post)
|
|
||||||
described_class.create!(post: parent_post, parent_post: ancestor_post)
|
|
||||||
|
|
||||||
implication = described_class.new(post: post_record, parent_post:)
|
|
||||||
|
|
||||||
expect(implication).to be_valid
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'terminates when existing ancestors already contain a cycle' do
|
|
||||||
ancestor_post = create(:post)
|
|
||||||
described_class.create!(post: parent_post, parent_post: ancestor_post)
|
|
||||||
legacy_implication = described_class.new(
|
|
||||||
post: ancestor_post, parent_post:)
|
|
||||||
legacy_implication.save!(validate: false)
|
|
||||||
|
|
||||||
implication = described_class.new(post: post_record, parent_post:)
|
|
||||||
|
|
||||||
expect(implication).to be_valid
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -70,6 +70,16 @@ describe ('SidebarComponent', () => {
|
|||||||
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
|
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 () => {
|
it ('uses maxWidth without applying the container main-width reserve twice', async () => {
|
||||||
localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
|
localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
|
||||||
const onWidthChange = vi.fn ()
|
const onWidthChange = vi.fn ()
|
||||||
|
|||||||
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
|
|||||||
</style>
|
</style>
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div className="h-full overflow-y-auto p-4 sidebar">
|
<div className="h-full md:overflow-y-auto p-4 sidebar">
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -35,6 +35,10 @@ const renderPage = () =>
|
|||||||
describe ('TagDetailPage', () => {
|
describe ('TagDetailPage', () => {
|
||||||
beforeEach (() => {
|
beforeEach (() => {
|
||||||
vi.clearAllMocks ()
|
vi.clearAllMocks ()
|
||||||
|
tagsApi.fetchTag.mockReset ()
|
||||||
|
api.apiPut.mockReset ()
|
||||||
|
api.isApiError.mockReset ()
|
||||||
|
toastApi.toast.mockReset ()
|
||||||
api.isApiError.mockReturnValue (false)
|
api.isApiError.mockReturnValue (false)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -51,8 +55,11 @@ describe ('TagDetailPage', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it ('submits edited tag fields', async () => {
|
it ('submits edited tag fields', async () => {
|
||||||
tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
|
||||||
api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
|
tagsApi.fetchTag
|
||||||
|
.mockResolvedValue (updatedTag)
|
||||||
|
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
||||||
|
api.apiPut.mockResolvedValueOnce (updatedTag)
|
||||||
|
|
||||||
renderPage ()
|
renderPage ()
|
||||||
|
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする