Feed filter implementation
This commit is contained in:
@@ -13,7 +13,7 @@ class FakeIntersectionObserver {
|
||||
vi.stubGlobal('IntersectionObserver', FakeIntersectionObserver)
|
||||
|
||||
describe('useFeeds', () => {
|
||||
const { feeds, showMessage, message, showModal, fetchData, sync, getReadable, setInitialLoad, handleIntersection } = useFeeds()
|
||||
const { feeds, allItems, feedFilter, feedTitles, unreadCount, setFeedFilter, showMessage, message, showModal, fetchData, sync, getReadable, setInitialLoad, handleIntersection, markAllRead } = useFeeds()
|
||||
|
||||
beforeEach(() => {
|
||||
localStorage.setItem('user-token', 'test-token')
|
||||
@@ -21,6 +21,8 @@ describe('useFeeds', () => {
|
||||
vi.clearAllMocks()
|
||||
|
||||
feeds.value = []
|
||||
allItems.value = []
|
||||
feedFilter.value = null
|
||||
showMessage.value = false
|
||||
message.value = ''
|
||||
showModal.value = false
|
||||
@@ -117,6 +119,108 @@ describe('useFeeds', () => {
|
||||
setInitialLoad(false)
|
||||
})
|
||||
|
||||
describe('feed filter', () => {
|
||||
const twoFeedsResponse = {
|
||||
data: {
|
||||
feeds: [
|
||||
{
|
||||
title: 'Feed A',
|
||||
items: [
|
||||
{ id: 1, title: 'A1', content: '', url: 'https://example.test/a1', timestamp: '2026-01-01 10:00:00' },
|
||||
{ id: 3, title: 'A2', content: '', url: 'https://example.test/a2', timestamp: '2026-01-03 10:00:00' },
|
||||
],
|
||||
},
|
||||
{
|
||||
title: 'Feed B',
|
||||
items: [
|
||||
{ id: 2, title: 'B1', content: '', url: 'https://example.test/b1', timestamp: '2026-01-02 10:00:00' },
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
}
|
||||
|
||||
it('narrows the displayed list to a single feed and restores it on "All feeds"', async () => {
|
||||
axios.get.mockResolvedValueOnce(twoFeedsResponse)
|
||||
await fetchData()
|
||||
|
||||
// Options are the distinct feed titles, sorted.
|
||||
expect(feedTitles.value).toEqual(['Feed A', 'Feed B'])
|
||||
// Unfiltered: everything, newest first (Jan 3, Jan 2, Jan 1).
|
||||
expect(feeds.value.map(f => f.id)).toEqual([3, 2, 1])
|
||||
|
||||
await setFeedFilter('Feed A')
|
||||
expect(feeds.value.map(f => f.id)).toEqual([3, 1])
|
||||
|
||||
await setFeedFilter(null)
|
||||
expect(feeds.value.map(f => f.id)).toEqual([3, 2, 1])
|
||||
})
|
||||
|
||||
it('does not resurrect read articles when the filter is cleared', async () => {
|
||||
axios.get.mockResolvedValueOnce(twoFeedsResponse)
|
||||
axios.put.mockResolvedValue({ status: 200 })
|
||||
await fetchData()
|
||||
|
||||
await setFeedFilter('Feed A')
|
||||
setInitialLoad(true)
|
||||
|
||||
// The first Feed A article scrolls above the viewport → marked read and
|
||||
// dropped from both the filtered list and the master.
|
||||
await handleIntersection([
|
||||
{ isIntersecting: false, boundingClientRect: { y: -10 }, target: { id: '0' } },
|
||||
])
|
||||
setInitialLoad(false)
|
||||
|
||||
expect(feeds.value.map(f => f.id)).toEqual([1])
|
||||
|
||||
await setFeedFilter(null)
|
||||
// Article 3 stays gone; the still-unread articles remain, newest first.
|
||||
expect(feeds.value.map(f => f.id)).toEqual([2, 1])
|
||||
})
|
||||
|
||||
it('keeps an emptied filtered feed selected and selectable, showing "All caught up"', async () => {
|
||||
axios.get.mockResolvedValueOnce(twoFeedsResponse)
|
||||
axios.put.mockResolvedValue({ status: 200 })
|
||||
await fetchData()
|
||||
|
||||
await setFeedFilter('Feed B')
|
||||
expect(feeds.value.map(f => f.id)).toEqual([2])
|
||||
|
||||
// Mark all (visible = just Feed B) read — Feed B has no unread items left.
|
||||
vi.spyOn(window, 'confirm').mockReturnValue(true)
|
||||
await markAllRead()
|
||||
|
||||
// The list empties, but the filter stays put and the feed remains a
|
||||
// selectable option (so the <select> never dangles) even though it no
|
||||
// longer has unread items.
|
||||
expect(feeds.value).toEqual([])
|
||||
expect(feedFilter.value).toBe('Feed B')
|
||||
expect(feedTitles.value).toEqual(['Feed A', 'Feed B'])
|
||||
|
||||
// Switching away drops the now-empty feed from the options.
|
||||
await setFeedFilter(null)
|
||||
expect(feedTitles.value).toEqual(['Feed A'])
|
||||
expect(feeds.value.map(f => f.id)).toEqual([3, 1])
|
||||
})
|
||||
|
||||
it('counts unread items in the selected feed when a filter is active, else the global total', async () => {
|
||||
axios.get.mockResolvedValueOnce(twoFeedsResponse)
|
||||
await fetchData()
|
||||
|
||||
// No filter: global unread total across both feeds.
|
||||
expect(unreadCount.value).toBe(3)
|
||||
|
||||
// Filtered: only the selected feed's unread items.
|
||||
await setFeedFilter('Feed B')
|
||||
expect(unreadCount.value).toBe(1)
|
||||
await setFeedFilter('Feed A')
|
||||
expect(unreadCount.value).toBe(2)
|
||||
|
||||
await setFeedFilter(null)
|
||||
expect(unreadCount.value).toBe(3)
|
||||
})
|
||||
})
|
||||
|
||||
it('strips leftover embedded-video placeholder headings', async () => {
|
||||
feeds.value = [{
|
||||
id: 1,
|
||||
|
||||
Reference in New Issue
Block a user