Update testings

Author: ije

framework/core/redirect_test.ts

@@ -3,67 +3,76 @@
  * see https://github.com/denoland/deno/blob/main/docs/runtime/location_api.md
  * and explanation below.
  */
+
 import { assertEquals } from 'std/testing/asserts.ts'
+import events from './events.ts'
 import { redirect } from './redirect.ts'
 
 // mock history functions used in redirect()
-interface MockWindow extends Window {
-    history: {
-        replaceState: (state: object | null, title: string | '', url?: string) => void,
-        pushState: (state: object | null, title: string | '', url?: string) => void
-    }
-}
-declare let window: MockWindow
+Object.assign(window, {
+  history: {
+    replaceState: (url: string) => { stacks.replaceCalls++ },
+    pushState: (url: string) => { stacks.pushCalls++ }
+  }
+})
 
 // track calls to history functions
-const calls = {
-    pushCalls: 0, // tracks calls to pushState()
-    replaceCalls: 0 // tracks calls to replaceState()
-}
-// create mock history impl
-window.history = {
-    replaceState: (url) => { calls.replaceCalls++; return null },
-    pushState: (url) => { calls.pushCalls++; return null }
+const stacks = {
+  pushCalls: 0, // tracks calls to pushState()
+  replaceCalls: 0 // tracks calls to replaceState()
 }
 
-const resetCallCount = () => {
-    calls.pushCalls = 0
-    calls.replaceCalls = 0
+const resetStacks = () => {
+  stacks.pushCalls = 0
+  stacks.replaceCalls = 0
 }
 
-Deno.test('redirect: replace=false should call history.pushState', () => {
-    const url = '/foo/bar.ts'
+Deno.test('fw/core/redirect: replace=false should call history.pushState', () => {
+  const url = '/foo/bar'
 
-    redirect(url)
-    assertEquals(calls.pushCalls, 1)
-    redirect(url)
-    assertEquals(calls.pushCalls, 2)
-    redirect(url)
-    assertEquals(calls.pushCalls, 3)
+  redirect(url)
+  assertEquals(stacks.pushCalls, 1)
+  redirect(url)
+  assertEquals(stacks.pushCalls, 2)
+  redirect(url)
+  assertEquals(stacks.pushCalls, 3)
 
-    resetCallCount()
+  resetStacks()
 })
 
-Deno.test('redirect: replace=true should call history.replaceState', () => {
-    const url = '/foo/bar2.ts'
+Deno.test('fw/core/redirect: replace=true should call history.replaceState', () => {
+  const url = '/foo/bar'
 
-    redirect(url, true)
-    assertEquals(calls.replaceCalls, 1)
-    redirect(url, true)
+  redirect(url, true)
+  assertEquals(stacks.replaceCalls, 1)
+  redirect(url, true)
+  assertEquals(stacks.replaceCalls, 2)
 
-    assertEquals(calls.replaceCalls, 2)
 
-    resetCallCount()
+  resetStacks()
 })
 
-Deno.test('redirect: empty string url should not call history methods', () => {
-    const url = ''
+Deno.test('fw/core/redirect: empty string url should not call history methods', () => {
+  redirect('')
+
+  assertEquals(stacks.pushCalls, 0)
+  assertEquals(stacks.replaceCalls, 0)
+})
+
+Deno.test('fw/core/redirect: pre-redirect should emit "popstate" event deferredly', () => {
+  let popstate: any = null
+
+  redirect('/foo/bar', true)
 
-    redirect(url)
+  events.on('popstate', (e) => { popstate = e })
+  assertEquals(popstate, null)
 
-    assertEquals(calls.pushCalls, 0)
-    assertEquals(calls.replaceCalls, 0)
+  events.emit('routerstate', { ready: true })
+  assertEquals(popstate, { type: 'popstate', resetScroll: true })
+  assertEquals(stacks.pushCalls, 0)
+  assertEquals(stacks.replaceCalls, 1)
 
+  resetStacks()
 })
 
 /**
@@ -72,7 +81,7 @@ Deno.test('redirect: empty string url should not call history methods', () => {
  * https://github.com/denoland/deno/blob/main/docs/runtime/location_api.md
  * This errors out on line 12 of redirect().
  */
-// Deno.test('redirect: file url should set location.href', () => {
+// Deno.test('fw/core/redirect: file url should set location.href', () => {
 //     const url = 'file://foo/file.ts'
 
 //     redirect(url)
@@ -81,5 +90,5 @@ Deno.test('redirect: empty string url should not call history methods', () => {
 //     assertEquals(calls.pushCalls, 0)
 //     assertEquals(calls.replaceCalls, 0)
 
-//     resetCallCount()
+//     resetStacks()
 // })

server/helper_test.ts

@@ -46,21 +46,21 @@ Deno.test(`server/helper: toLocalUrl`, () => {
   )
 })
 
-Deno.test('server/helper isLoaderPlugin false', () => {
+Deno.test('server/helper: isLoaderPlugin false', () => {
   const loader = {} as LoaderPlugin
   loader.type = 'foobar' as 'loader'
 
   assert(!isLoaderPlugin(loader))
 })
 
-Deno.test('server/helper isLoaderPlugin true', () => {
+Deno.test('server/helper: isLoaderPlugin true', () => {
   const loader = {} as LoaderPlugin
   loader.type = 'loader'
 
   assert(isLoaderPlugin(loader))
 })
 
-Deno.test('server/helper getAlephPkgUri dev', () => {
+Deno.test('server/helper: getAlephPkgUri dev', () => {
   const port = 1234
   Deno.env.set('ALEPH_DEV_PORT', port.toString())
 
@@ -83,7 +83,6 @@ Deno.test('server/helper: getRelativePath', () => {
   assertEquals(getRelativePath('/baz/foobar', '/baz/aleph'), '../aleph')
   assertEquals(getRelativePath('baz/foobar', 'baz/aleph'), '../aleph')
   assertEquals(getRelativePath('baz/foobar', 'baz/foobar/aleph'), './aleph')
-
 })
 
 Deno.test('server/helper: toLocalUrl()', () => {
@@ -99,8 +98,7 @@ Deno.test('server/helper: computeHash', () => {
   assertEquals(computeHash(new Uint8Array([21, 31])), 'b0d04c3ac51b86296251d73c20f348e9ae0042a4')
 })
 
-Deno.test('server/helper formatBytesWithColor', () => {
-
+Deno.test('server/helper: formatBytesWithColor', () => {
   // 10 << 20 = 10485760 (10MB)
   const TenLeftShift20 = 10485760
   // 1 << 20 = 1048576 (1MB)
@@ -109,10 +107,12 @@ Deno.test('server/helper formatBytesWithColor', () => {
   const OneMb = OneLeftShift20
   // "\x1b[2m1018KB\x1b[22m"
   assertEquals(formatBytesWithColor(OneMb), "\x1b[2m1MB\x1b[22m")
+
   const TwoMb = OneLeftShift20 + 1024
   // "\x1b[33m2MB\x1b[39m"
   assertEquals(formatBytesWithColor(TwoMb), "\x1b[33m2MB\x1b[39m")
+
   const ElevenMb = TenLeftShift20 + 1024
   // "\x1b[31m11MB\x1b[39m"
   assertEquals(formatBytesWithColor(ElevenMb), "\x1b[31m11MB\x1b[39m")
-})
+})