Add test for isSrcDir telemetry

vercel · Oct 23, 2019 · eb5fe67 · eb5fe67
1 parent 25a985f
commit eb5fe67
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -125,7 +125,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
     telemetry.record(
       eventVersion({
         cliCommand: 'build',
-        isSrcDir: pagesDir.startsWith('src'),
+        isSrcDir: path.relative(dir, pagesDir!).startsWith('src'),
       })
     ),
     eventNextPlugins(path.resolve(dir)).then(events => telemetry.record(events))

diff --git a/packages/next/server/next-dev-server.ts b/packages/next/server/next-dev-server.ts
@@ -210,7 +210,7 @@ export default class DevServer extends Server {
     telemetry.record(
       eventVersion({
         cliCommand: 'dev',
-        isSrcDir: this.pagesDir!.startsWith('src'),
+        isSrcDir: relative(this.dir, this.pagesDir!).startsWith('src'),
       })
     )
   }

diff --git a/test/integration/telemetry/test/index.test.js b/test/integration/telemetry/test/index.test.js
@@ -1,9 +1,13 @@
 /* eslint-env jest */
 /* global jasmine */
+import path from 'path'
+import fs from 'fs-extra'
 import { runNextCommand } from 'next-test-utils'
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 2
 
+const appDir = path.join(__dirname, '..')
+
 describe('Telemetry CLI', () => {
   it('can print telemetry status', async () => {
     const { stdout } = await runNextCommand(['telemetry'], {
@@ -59,4 +63,26 @@ describe('Telemetry CLI', () => {
     expect(stdout).toMatch(/already disabled/)
     expect(stdout).toMatch(/Status: Disabled/)
   })
+
+  it('detects isSrcDir dir correctly', async () => {
+    const { stderr } = await runNextCommand(['build', appDir], {
+      stderr: true,
+      env: {
+        NEXT_TELEMETRY_DEBUG: 1
+      }
+    })
+
+    expect(stderr).toMatch(/isSrcDir.*?false/)
+
+    await fs.move(path.join(appDir, 'pages'), path.join(appDir, 'src/pages'))
+    const { stderr: stderr2 } = await runNextCommand(['build', appDir], {
+      stderr: true,
+      env: {
+        NEXT_TELEMETRY_DEBUG: 1
+      }
+    })
+    await fs.move(path.join(appDir, 'src/pages'), path.join(appDir, 'pages'))
+
+    expect(stderr2).toMatch(/isSrcDir.*?true/)
+  })
 })