Skip to content

Commit

Permalink
fix: fixed tests which were referring to getEvents function
Browse files Browse the repository at this point in the history
  • Loading branch information
@jerrythomas
jerrythomas committed Sep 16, 2024
1 parent fc3339d commit b7ab054
Show file tree
Hide file tree
Showing 26 changed files with 170 additions and 159 deletions.
8 changes: 6 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rokkit",
"version": "1.0.0-next.96",
"version": "1.0.0-next.97",
"description": "",
"main": "index.js",
"packageManager": "pnpm@9.2.0",
Expand All @@ -23,7 +23,11 @@
},
"author": "Jerry Thomas<me@jerrythomas.name>",
"license": "MIT",
"workspaces": ["packages/*", "sites/*", "shared/*"],
"workspaces": [
"packages/*",
"sites/*",
"shared/*"
],
"devDependencies": {
"bumpp": "^9.4.1",
"eslint": "^8.57.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/actions/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rokkit/actions",
"version": "1.0.0-next.96",
"version": "1.0.0-next.97",
"description": "Contains generic actions that can be used in various components.",
"author": "Jerry Thomas <me@jerrythomas.name>",
"license": "MIT",
Expand Down
3 changes: 2 additions & 1 deletion packages/actions/spec/mocks/store.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { vi } from 'vitest'
import { writable } from 'svelte/store'

export const mockStore = {
getEvents: vi.fn().mockReturnValue([]),
events: writable([]),
moveTo: vi.fn(),
moveByOffset: vi.fn(),
moveFirst: vi.fn(),
Expand Down
100 changes: 50 additions & 50 deletions packages/actions/spec/traversable/kbd-horizontal.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe('traversable', () => {
it('should trigger expand on ArrowDown', async () => {
await fireEvent.keyDown(root, { key: 'ArrowDown' })
expect(mockStore.expand).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
expect(mockCurrentNode.scrollIntoView).toHaveBeenCalledWith({
behavior: 'smooth',
block: 'nearest'
Expand All @@ -54,189 +54,189 @@ describe('traversable', () => {
it('should trigger collapse on ArrowUp', async () => {
await fireEvent.keyDown(root, { key: 'ArrowUp' })
expect(mockStore.collapse).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
expect(mockCurrentNode.scrollIntoView).toHaveBeenCalled()
})
it('should trigger moveByOffset on ArrowLeft', async () => {
await fireEvent.keyDown(root, { key: 'ArrowLeft' })
expect(mockStore.moveByOffset).toHaveBeenCalledWith(-1)
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger moveByOffset on ArrowRight', async () => {
await fireEvent.keyDown(root, { key: 'ArrowRight' })
expect(mockStore.moveByOffset).toHaveBeenCalledWith(1)
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger select on Enter', async () => {
await fireEvent.keyDown(root, { key: 'Enter' })
expect(mockStore.select).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger select on Space', async () => {
await fireEvent.keyDown(root, { key: ' ' })
expect(mockStore.select).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger escape on Escape', async () => {
await fireEvent.keyDown(root, { key: 'Escape' })
expect(mockStore.escape).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger moveFirst on Home', async () => {
await fireEvent.keyDown(root, { key: 'Home' })
expect(mockStore.moveFirst).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger moveLast on End', async () => {
await fireEvent.keyDown(root, { key: 'End' })
expect(mockStore.moveLast).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger moveByOffset on PageUp', async () => {
await fireEvent.keyDown(root, { key: 'PageUp' })
expect(mockStore.moveByOffset).toHaveBeenCalledWith(-10)
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger moveByOffset on PageDown', async () => {
await fireEvent.keyDown(root, { key: 'PageDown' })
expect(mockStore.moveByOffset).toHaveBeenCalledWith(10)
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger moveFirst on ctrl+ArrowLeft', async () => {
await fireEvent.keyDown(root, { key: 'ArrowLeft', ctrlKey: true })
expect(mockStore.moveFirst).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger moveLast on ctrl+ArrowRight', async () => {
await fireEvent.keyDown(root, { key: 'ArrowRight', ctrlKey: true })
expect(mockStore.moveLast).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalled()
// expect(mockStore.getEvents).toHaveBeenCalled()
})
it('should trigger selectAll on ctrl+A, meta+A', async () => {
await fireEvent.keyDown(root, { key: 'a', ctrlKey: true })
expect(mockStore.selectAll).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
await fireEvent.keyDown(root, { key: 'A', ctrlKey: true })
expect(mockStore.selectAll).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
await fireEvent.keyDown(root, { key: 'a', metaKey: true })
expect(mockStore.selectAll).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
await fireEvent.keyDown(root, { key: 'A', metaKey: true })
expect(mockStore.selectAll).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
})
it('should trigger selectNone on ctrl+D, meta+D', async () => {
await fireEvent.keyDown(root, { key: 'd', ctrlKey: true })
expect(mockStore.selectNone).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
await fireEvent.keyDown(root, { key: 'D', ctrlKey: true })
expect(mockStore.selectNone).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
await fireEvent.keyDown(root, { key: 'd', metaKey: true })
expect(mockStore.selectNone).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
await fireEvent.keyDown(root, { key: 'D', metaKey: true })
expect(mockStore.selectNone).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
})
it('should trigger selectInvert on ctrl+I, meta+I', async () => {
await fireEvent.keyDown(root, { key: 'i', ctrlKey: true })
expect(mockStore.selectInvert).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
await fireEvent.keyDown(root, { key: 'I', ctrlKey: true })
expect(mockStore.selectInvert).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
await fireEvent.keyDown(root, { key: 'i', metaKey: true })
expect(mockStore.selectInvert).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
await fireEvent.keyDown(root, { key: 'I', metaKey: true })
expect(mockStore.selectInvert).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
})
it('should trigger cut on ctrl+X, meta+X', async () => {
await fireEvent.keyDown(root, { key: 'x', ctrlKey: true })
expect(mockStore.cut).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
await fireEvent.keyDown(root, { key: 'X', ctrlKey: true })
expect(mockStore.cut).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
await fireEvent.keyDown(root, { key: 'x', metaKey: true })
expect(mockStore.cut).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
await fireEvent.keyDown(root, { key: 'X', metaKey: true })
expect(mockStore.cut).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
})
it('should trigger copy on ctrl+C, meta+C', async () => {
await fireEvent.keyDown(root, { key: 'c', ctrlKey: true })
expect(mockStore.copy).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
await fireEvent.keyDown(root, { key: 'C', ctrlKey: true })
expect(mockStore.copy).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
await fireEvent.keyDown(root, { key: 'c', metaKey: true })
expect(mockStore.copy).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
await fireEvent.keyDown(root, { key: 'C', metaKey: true })
expect(mockStore.copy).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
})
it('should trigger paste on ctrl+V, meta+V', async () => {
await fireEvent.keyDown(root, { key: 'v', ctrlKey: true })
expect(mockStore.paste).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
await fireEvent.keyDown(root, { key: 'V', ctrlKey: true })
expect(mockStore.paste).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
await fireEvent.keyDown(root, { key: 'v', metaKey: true })
expect(mockStore.paste).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
await fireEvent.keyDown(root, { key: 'V', metaKey: true })
expect(mockStore.paste).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
})
it('should trigger undo on ctrl+Z, meta+Z', async () => {
await fireEvent.keyDown(root, { key: 'z', ctrlKey: true })
expect(mockStore.undo).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
await fireEvent.keyDown(root, { key: 'Z', ctrlKey: true })
expect(mockStore.undo).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
await fireEvent.keyDown(root, { key: 'z', metaKey: true })
expect(mockStore.undo).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
await fireEvent.keyDown(root, { key: 'Z', metaKey: true })
expect(mockStore.undo).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
})
it('should trigger redo on ctrl+Y, meta+Y', async () => {
await fireEvent.keyDown(root, { key: 'y', ctrlKey: true })
expect(mockStore.redo).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
await fireEvent.keyDown(root, { key: 'Y', ctrlKey: true })
expect(mockStore.redo).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
await fireEvent.keyDown(root, { key: 'y', metaKey: true })
expect(mockStore.redo).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
await fireEvent.keyDown(root, { key: 'Y', metaKey: true })
expect(mockStore.redo).toHaveBeenCalledWith()
expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
})
it('should trigger selectRange', async () => {
await fireEvent.keyDown(root, { key: 'ArrowRight', shiftKey: true })
expect(mockStore.selectRange).toHaveBeenCalledWith(1)
expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(1)
await fireEvent.keyDown(root, { key: 'ArrowLeft', shiftKey: true })
expect(mockStore.selectRange).toHaveBeenCalledWith(-1)
expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(2)
await fireEvent.keyDown(root, { key: 'Home', shiftKey: true })
expect(mockStore.selectRange).toHaveBeenCalledWith(-Infinity)
expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(3)
await fireEvent.keyDown(root, { key: 'End', shiftKey: true })
expect(mockStore.selectRange).toHaveBeenCalledWith(Infinity)
expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
// expect(mockStore.getEvents).toHaveBeenCalledTimes(4)
})
it('should not trigger selectRange', async () => {
await fireEvent.keyDown(root, { key: 'ArrowDown', shiftKey: true })
Expand All @@ -245,7 +245,7 @@ describe('traversable', () => {
expect(mockStore.selectRange).not.toHaveBeenCalled()
await fireEvent.keyDown(root, { key: 'ArrowUp', shiftKey: true, ctrlKey: true })
expect(mockStore.selectRange).not.toHaveBeenCalled()
expect(mockStore.getEvents).not.toHaveBeenCalledTimes(1)
// expect(mockStore.getEvents).not.toHaveBeenCalledTimes(1)
})
})
})
Loading

0 comments on commit b7ab054

Please sign in to comment.