Really really really fix the test now

Author: mischnic

test/production/app-dir/server-action-period-hash/server-action-period-hash-custom-key.test.ts

@@ -1,14 +1,9 @@
-import { nextTestSetup } from 'e2e-utils'
+import { nextTestSetup, type NextInstance } from 'e2e-utils'
 
-async function getServerActionManifest(next) {
-  const content = await next.readFile(
+async function getServerActionManifestNodeKeys(next: NextInstance) {
+  const manifest = await next.readJSON(
     '.next/server/server-reference-manifest.json'
   )
-  return JSON.parse(content)
-}
-
-async function getServerActionManifestNodeKeys(next) {
-  const manifest = await getServerActionManifest(next)
   return Object.keys(manifest.node)
 }
 
@@ -22,26 +17,26 @@ describe('app-dir - server-action-period-hash-custom-key', () => {
     process.env.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY = 'my-secret-key1'
     await next.build()
     delete process.env.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY
-    const firstManifest = await getServerActionManifestNodeKeys(next)
+    const firstActionIds = await getServerActionManifestNodeKeys(next)
 
     process.env.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY = 'my-secret-key2'
     await next.build()
     delete process.env.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY
-    const secondManifest = await getServerActionManifestNodeKeys(next)
+    const secondActionIds = await getServerActionManifestNodeKeys(next)
 
-    expect(firstManifest).not.toEqual(secondManifest)
+    expect(firstActionIds).not.toEqual(secondActionIds)
   })
 
   it('should have the same manifest if the encryption key from process env is same', async () => {
     process.env.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY = 'my-secret-key'
     await next.build()
-    const firstManifest = await getServerActionManifest(next)
+    const firstActionIds = await getServerActionManifestNodeKeys(next)
 
     await next.remove('.next') // dismiss cache
     await next.build() // build with the same secret key
     delete process.env.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY
-    const secondManifest = await getServerActionManifest(next)
+    const secondActionIds = await getServerActionManifestNodeKeys(next)
 
-    expect(firstManifest).toEqual(secondManifest)
+    expect(firstActionIds).toEqual(secondActionIds)
   })
 })

test/production/app-dir/server-action-period-hash/server-action-period-hash.test.ts

@@ -1,14 +1,9 @@
-import { nextTestSetup } from 'e2e-utils'
+import { nextTestSetup, type NextInstance } from 'e2e-utils'
 
-async function getServerActionManifest(next) {
-  const content = await next.readFile(
+async function getServerActionManifestNodeKeys(next: NextInstance) {
+  const manifest = await next.readJSON(
     '.next/server/server-reference-manifest.json'
   )
-  return JSON.parse(content)
-}
-
-async function getServerActionManifestNodeKeys(next) {
-  const manifest = await getServerActionManifest(next)
   return Object.keys(manifest.node)
 }
 
@@ -20,23 +15,23 @@ describe('app-dir - server-action-period-hash', () => {
 
   it('should have same manifest between continuous two builds', async () => {
     await next.build()
-    const firstManifest = await getServerActionManifestNodeKeys(next)
+    const firstActionIds = await getServerActionManifestNodeKeys(next)
 
     await next.build()
-    const secondManifest = await getServerActionManifestNodeKeys(next)
+    const secondActionIds = await getServerActionManifestNodeKeys(next)
 
-    expect(firstManifest).toEqual(secondManifest)
+    expect(firstActionIds).toEqual(secondActionIds)
   })
 
   it('should have different manifest between two builds with period hash', async () => {
     await next.build()
-    const firstManifest = await getServerActionManifestNodeKeys(next)
+    const firstActionIds = await getServerActionManifestNodeKeys(next)
 
     await next.remove('.next') // dismiss cache
     await next.build()
 
-    const secondManifest = await getServerActionManifestNodeKeys(next)
+    const secondActionIds = await getServerActionManifestNodeKeys(next)
 
-    expect(firstManifest).not.toEqual(secondManifest)
+    expect(firstActionIds).not.toEqual(secondActionIds)
   })
 })