Add tests for public file handling with basePath

ijjk · ijjk · commit 6f0b0be952e7 · 2020-08-19T11:52:07.000-05:00
diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
@@ -787,7 +787,7 @@ export default class Server {
 
           // if basePath is defined require it be present
           if (basePath) {
-            if (pathParts[0] !== basePath) return { finished: false }
+            if (pathParts[0] !== basePath.substr(1)) return { finished: false }
             pathParts.shift()
           }
 
diff --git a/test/integration/basepath/test/index.test.js b/test/integration/basepath/test/index.test.js
@@ -135,6 +135,17 @@ const runTests = (context, dev = false) => {
     })
   }
 
+  it('should 404 for public file without basePath', async () => {
+    const res = await fetchViaHTTP(context.appPort, '/data.txt')
+    expect(res.status).toBe(404)
+  })
+
+  it('should serve public file with basePath correctly', async () => {
+    const res = await fetchViaHTTP(context.appPort, '/docs/data.txt')
+    expect(res.status).toBe(200)
+    expect(await res.text()).toBe('hello world')
+  })
+
   it('should rewrite with basePath by default', async () => {
     const html = await renderViaHTTP(context.appPort, '/docs/rewrite-1')
     expect(html).toContain('getServerSideProps')

Original file line number	Diff line number	Diff line change
`@@ -787,7 +787,7 @@ export default class Server {`
`787`	`787`
`788`	`788`	`// if basePath is defined require it be present`
`789`	`789`	`if (basePath) {`
`790`		`- if (pathParts[0] !== basePath) return { finished: false }`
	`790`	`+ if (pathParts[0] !== basePath.substr(1)) return { finished: false }`
`791`	`791`	`pathParts.shift()`
`792`	`792`	`}`
`793`	`793`