remove useles env code and fix test env

Author: nklayman

__tests__/commands.spec.js

@@ -170,26 +170,6 @@ describe('build:electron', () => {
       'projectPath/dist_electron/bundled/css/fonts'
     )
   })
-
-  test('--mode argument takes precedence over other options', async () => {
-    await runCommand(
-      'build:electron',
-      { pluginOptions: { electronBuilder: { buildMode: 'production' } } },
-      { headless: true, mode: 'development' }
-    )
-
-    // Development mode is used
-    expect(buildRenderer.mock.calls[0][0].mode).toBe('development')
-  })
-
-  test('buildMode sets Vue mode if provided', async () => {
-    await runCommand('build:electron', {
-      pluginOptions: { electronBuilder: { buildMode: 'development' } }
-    })
-
-    // Development mode is used
-    expect(buildRenderer.mock.calls[0][0].mode).toBe('development')
-  })
 })
 
 describe('serve:electron', () => {
@@ -289,41 +269,6 @@ describe('serve:electron', () => {
     // Electron is not launched
     expect(execa).not.toBeCalled()
   })
-  test('If --headless argument is passed, serve:electron is launched in production mode', async () => {
-    await runCommand(
-      'serve:electron',
-      {
-        // It should take precedence over plugin options
-        pluginOptions: { electronBuilder: { serveMode: 'production' } }
-      },
-      { headless: true }
-    )
-
-    // Production mode is used
-    expect(serve.mock.calls[0][0].mode).toBe('production')
-    // Electron is not launched
-    expect(execa).not.toBeCalled()
-  })
-
-  test('--mode argument takes precedence over other options', async () => {
-    await runCommand(
-      'serve:electron',
-      { pluginOptions: { electronBuilder: { serveMode: 'production' } } },
-      { headless: true, mode: 'development' }
-    )
-
-    // Development mode is used
-    expect(serve.mock.calls[0][0].mode).toBe('development')
-  })
-
-  test('serveMode sets Vue mode if provided', async () => {
-    await runCommand('serve:electron', {
-      pluginOptions: { electronBuilder: { serveMode: 'production' } }
-    })
-
-    // Development mode is used
-    expect(serve.mock.calls[0][0].mode).toBe('production')
-  })
 })
 
 describe('testWithSpectron', async () => {
@@ -386,12 +331,30 @@ describe('testWithSpectron', async () => {
     await runSpectron({ spectronOptions: { testKey: 'expected' } })
     expect(Application.mock.calls[0][0].testKey).toBe('expected')
   })
+  test('launches dev server in production mode if forceDev argument is not provided', async () => {
+    await runSpectron()
+
+    // Node env was set to production
+    expect(execa.mock.calls[0][2].env.NODE_ENV).toBe('production')
+  })
   test('launches dev server in dev mode if forceDev argument is provided', async () => {
     await runSpectron({ forceDev: true })
 
-    // Mode argument was set to development
+    // Node env was set to development
+    expect(execa.mock.calls[0][2].env.NODE_ENV).toBe('development')
+  })
+  test('default vue mode is test', async () => {
+    await runSpectron()
+
+    // Mode argument was set to test
+    expect(execa.mock.calls[0][1].join(' ').indexOf('--mode test')).not.toBe(-1)
+  })
+  test('custom vue mode is used if provided', async () => {
+    await runSpectron({ mode: 'expected' })
+
+    // Mode argument was set to expected
     expect(
-      execa.mock.calls[0][1].join(' ').indexOf('--mode development')
+      execa.mock.calls[0][1].join(' ').indexOf('--mode expected')
     ).not.toBe(-1)
   })
   test('returns stdout of command', async () => {

__tests__/testWithSpectron.spec.js

@@ -18,11 +18,14 @@ test('basic tests pass', async () => {
     `jest.setTimeout(60000)
   const { testWithSpectron } = require('vue-cli-plugin-electron-builder')
   test('app loads a window', async () => {
-    const { app, stopServe } = await testWithSpectron()
+    const { app, stdout, stopServe } = await testWithSpectron({mode: 'production'})
     expect(await app.client.getWindowCount()).toBe(1)
+    // App is served in production mode
+    expect(stdout.indexOf('App is served in production mode.')).not.toBe(-1)
     await stopServe()
   })
   `
   )
+  process.env.NODE_ENV = 'production'
   await project.run('vue-cli-service test:unit')
 })

docs/guide/testingAndDebugging.md

@@ -55,6 +55,7 @@ testWithSpectron({
   noSpectron: false // Disables launching of Spectron. Enable this if you want to launch spectron yourself.
   noStart: false // Do not start Spectron app or wait for it to load. You will have to call app.start() and app.client.waitUntilWindowLoaded() before running any tests.
   forceDev: false // Run dev server in development mode. By default it is run in production (serve --mode production).
+  mode: 'test', // Set custom Vue env mode.
   spectronOptions: {} // Custom options to be passed to Spectron. Defaults are already set, only use this if you need something customized.
 })
 ```

index.d.ts

@@ -13,6 +13,8 @@ interface Options {
    You will have to run app.start() and app.client.waitUntilWindowLoaded() yourself.
    */
   noStart: boolean
+  /** Set custom Vue env mode. Defaults to 'test' */
+  mode: string
 }
 interface Server {
   /** Spectron instance. */

index.js

@@ -36,7 +36,6 @@ module.exports = (api, options) => {
       const buildRenderer = require('@vue/cli-service/lib/commands/build').build
       const fs = require('fs-extra')
       const builder = require('electron-builder')
-      const mode = args.mode || pluginOptions.buildMode
       const yargs = require('yargs')
       //   Import the yargs options from electron-builder
       const configureBuildCommand = require('electron-builder/out/builder')
@@ -77,9 +76,7 @@ module.exports = (api, options) => {
         // Make sure files are outputted to proper directory
         dest: outputDir + '/bundled',
         // Enable modern mode
-        modern: true,
-        // Apply mode if provided
-        ...(mode ? { mode } : {})
+        modern: true
       }
       const mainConfig = new Config()
       //   Configure main process webpack config
@@ -194,12 +191,6 @@ module.exports = (api, options) => {
     args => {
       const execa = require('execa')
       const serve = require('@vue/cli-service/lib/commands/serve').serve
-      // --mode > headless > pluginOptions > defaults
-      const mode =
-        args.mode ||
-        (args.headless ? 'production' : null) ||
-        pluginOptions.serveMode
-      console.log(mode)
       const rendererConfig = api.resolveChainableWebpackConfig()
       //   Configure renderer process to work properly with electron
       rendererConfig
@@ -256,9 +247,7 @@ module.exports = (api, options) => {
         {
           _: [],
           // Use dashboard if called from ui
-          dashboard: args.dashboard,
-          // Apply mode if provided
-          ...(mode ? { mode } : {})
+          dashboard: args.dashboard
         },
         api,
         options,

lib/testWithSpectron.js

@@ -13,11 +13,13 @@ module.exports = (options = {}) =>
     // Launch serve:electron in headless mode
     const child = execa(
       require.resolve('@vue/cli-service/bin/vue-cli-service'),
-      [
-        'serve:electron',
-        '--headless',
-        ...(options.forceDev ? ['--mode', 'development'] : [])
-      ]
+      ['serve:electron', '--headless', '--mode', options.mode || 'test'],
+      {
+        env: {
+          ...process.env,
+          NODE_ENV: !options.forceDev ? 'production' : 'development'
+        }
+      }
     )
     // Exit if serve:electron throws an error
     child.on('error', err => {