Skip to content

Commit 096d3b1

Browse files
nklaymannklayman
committed
fix(linting): enable eslint and fix linting errors
1 parent 261b78e commit 096d3b1

File tree

15 files changed

+649
-467
lines changed

15 files changed

+649
-467
lines changed

‎.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
module.exports = {
22
extends: 'standard',
3+
ignorePatterns: [
4+
'__tests__/projects/*',
5+
'generator/templates/base/src/background.js'
6+
],
37
env: {
48
jest: true
59
}

‎__tests__/build.helper.js

Lines changed: 65 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -5,81 +5,79 @@ const portfinder = require('portfinder')
55
const checkLogs = require('./checkLogs.helper.js')
66

77
portfinder.basePort = 9515
8-
const runTests = useTS =>
9-
new Promise(async resolve => {
10-
const { project, projectName } = await create('build', useTS)
8+
const runTests = async useTS => {
9+
const { project, projectName } = await create('build', useTS)
1110

12-
const isWin = process.platform === 'win32'
13-
const projectPath = p =>
14-
path.join(process.cwd(), '__tests__/projects/' + projectName, p)
11+
const isWin = process.platform === 'win32'
12+
const projectPath = p =>
13+
path.join(process.cwd(), '__tests__/projects/' + projectName, p)
1514

16-
await project.run('vue-cli-service electron:build --x64 --dir')
17-
// Ensure /dist is not modified
18-
expect(project.has('dist')).toBe(false)
19-
// Ensure build successfully outputted files
20-
expect(project.has('dist_electron/bundled/index.html')).toBe(true)
21-
expect(project.has('dist_electron/bundled/favicon.ico')).toBe(true)
22-
expect(project.has('dist_electron/bundled/js')).toBe(true)
23-
expect(project.has('dist_electron/bundled/css')).toBe(true)
24-
expect(project.has('dist_electron/bundled/background.js')).toBe(true)
25-
if (isWin) {
26-
expect(project.has(`dist_electron/win-unpacked/${projectName}.exe`)).toBe(
27-
true
28-
)
29-
} else {
30-
expect(project.has(`dist_electron/linux-unpacked/${projectName}`)).toBe(
31-
true
32-
)
33-
}
34-
// Ensure that setup files were not created
35-
expect(project.has(`dist_electron/${projectName} Setup 0.1.0.exe`)).toBe(
36-
false
15+
await project.run('vue-cli-service electron:build --x64 --dir')
16+
// Ensure /dist is not modified
17+
expect(project.has('dist')).toBe(false)
18+
// Ensure build successfully outputted files
19+
expect(project.has('dist_electron/bundled/index.html')).toBe(true)
20+
expect(project.has('dist_electron/bundled/favicon.ico')).toBe(true)
21+
expect(project.has('dist_electron/bundled/js')).toBe(true)
22+
expect(project.has('dist_electron/bundled/css')).toBe(true)
23+
expect(project.has('dist_electron/bundled/background.js')).toBe(true)
24+
if (isWin) {
25+
expect(project.has(`dist_electron/win-unpacked/${projectName}.exe`)).toBe(
26+
true
3727
)
38-
expect(
39-
project.has(`dist_electron/${projectName}-0.1.0-x86_64.AppImage`)
40-
).toBe(false)
41-
expect(project.has(`dist_electron/${projectName}_0.1.0_amd64`)).toBe(false)
42-
// Launch app with spectron
43-
const app = new Application({
44-
path: `./__tests__/projects/${projectName}/dist_electron/${
28+
} else {
29+
expect(project.has(`dist_electron/linux-unpacked/${projectName}`)).toBe(
30+
true
31+
)
32+
}
33+
// Ensure that setup files were not created
34+
expect(project.has(`dist_electron/${projectName} Setup 0.1.0.exe`)).toBe(
35+
false
36+
)
37+
expect(
38+
project.has(`dist_electron/${projectName}-0.1.0-x86_64.AppImage`)
39+
).toBe(false)
40+
expect(project.has(`dist_electron/${projectName}_0.1.0_amd64`)).toBe(false)
41+
// Launch app with spectron
42+
const app = new Application({
43+
path: `./__tests__/projects/${projectName}/dist_electron/${
4544
isWin ? 'win' : 'linux'
4645
}-unpacked/${projectName}${isWin ? '.exe' : ''}`,
47-
// Make sure tests do not interfere with each other
48-
port: await portfinder.getPortPromise(),
49-
// Increase wait timeout for parallel testing
50-
waitTimeout: 10000
51-
})
52-
await app.start()
53-
const win = app.browserWindow
54-
const client = app.client
55-
await client.waitUntilWindowLoaded()
46+
// Make sure tests do not interfere with each other
47+
port: await portfinder.getPortPromise(),
48+
// Increase wait timeout for parallel testing
49+
waitTimeout: 10000
50+
})
51+
await app.start()
52+
const win = app.browserWindow
53+
const client = app.client
54+
await client.waitUntilWindowLoaded()
5655

57-
// Check that proper info was logged
58-
await checkLogs({ client, projectName, projectPath, mode: 'build' })
56+
// Check that proper info was logged
57+
await checkLogs({ client, projectName, projectPath, mode: 'build' })
5958

60-
// Window was created
61-
expect(await client.getWindowCount()).toBe(1)
62-
// It is not minimized
63-
expect(await win.isMinimized()).toBe(false)
64-
// Dev tools is not open
65-
expect(await win.isDevToolsOpened()).toBe(false)
66-
// Window is visible
67-
expect(await win.isVisible()).toBe(true)
68-
// Size is correct
69-
const { width, height } = await win.getBounds()
70-
expect(width).toBeGreaterThan(0)
71-
expect(height).toBeGreaterThan(0)
72-
// Load was successful
73-
expect(await app.webContents.isLoading()).toBe(false)
74-
// App is loaded properly
75-
expect(
76-
(await client.getHTML('#app')).indexOf(
59+
// Window was created
60+
expect(await client.getWindowCount()).toBe(1)
61+
// It is not minimized
62+
expect(await win.isMinimized()).toBe(false)
63+
// Dev tools is not open
64+
expect(await win.isDevToolsOpened()).toBe(false)
65+
// Window is visible
66+
expect(await win.isVisible()).toBe(true)
67+
// Size is correct
68+
const { width, height } = await win.getBounds()
69+
expect(width).toBeGreaterThan(0)
70+
expect(height).toBeGreaterThan(0)
71+
// Load was successful
72+
expect(await app.webContents.isLoading()).toBe(false)
73+
// App is loaded properly
74+
expect(
75+
(await client.getHTML('#app')).indexOf(
7776
`Welcome to Your Vue.js ${useTS ? '+ TypeScript ' : ''}App`
78-
)
79-
).not.toBe(-1)
77+
)
78+
).not.toBe(-1)
8079

81-
await app.stop()
82-
resolve()
83-
})
80+
await app.stop()
81+
}
8482

8583
module.exports.runTests = runTests

‎__tests__/commands.spec.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ chokidar.watch.mockImplementation(file => {
8282
const serviceRun = jest.fn().mockResolvedValue({ url: 'serveUrl' })
8383
const runCommand = async (command, options = {}, args = {}, rawArgs = []) => {
8484
if (!args._) args._ = []
85-
let commands = {}
85+
const commands = {}
8686
const api = {
8787
// Make app think typescript plugin is installed
8888
hasPlugin: jest.fn().mockReturnValue(true),
@@ -372,7 +372,7 @@ describe('electron:build', () => {
372372
await runCommand('electron:build')
373373

374374
expect(fs.writeFileSync).toBeCalledWith(
375-
`dist_electron/bundled/package.json`,
375+
'dist_electron/bundled/package.json',
376376
JSON.stringify({
377377
dependencies: {
378378
external: '^0.0.1'
@@ -396,7 +396,7 @@ describe('electron:build', () => {
396396
const mockRun = jest
397397
.fn()
398398
.mockImplementation((cb) => cb(undefined, { hasErrors: () => false }))
399-
webpack.mockReturnValue({run: mockRun})
399+
webpack.mockReturnValue({ run: mockRun })
400400
await runCommand('electron:build', {
401401
pluginOptions: {
402402
electronBuilder: {
@@ -408,7 +408,7 @@ describe('electron:build', () => {
408408
expect(webpack).toBeCalledTimes(2)
409409
const preloadWebpackCall = webpack.mock.calls[1][0]
410410
expect(preloadWebpackCall.target).toBe('electron-preload')
411-
expect(preloadWebpackCall.entry).toEqual({preload: ['projectPath/preloadFile']})
411+
expect(preloadWebpackCall.entry).toEqual({ preload: ['projectPath/preloadFile'] })
412412
// Make sure preload bundle has been run
413413
expect(mockRun).toHaveBeenCalledTimes(2)
414414
webpack.mockClear()
@@ -418,11 +418,11 @@ describe('electron:build', () => {
418418
const mockRun = jest
419419
.fn()
420420
.mockImplementation((cb) => cb(undefined, { hasErrors: () => false }))
421-
webpack.mockReturnValue({run: mockRun})
421+
webpack.mockReturnValue({ run: mockRun })
422422
await runCommand('electron:build', {
423423
pluginOptions: {
424424
electronBuilder: {
425-
preload: {firstPreload: 'preload1', secondPreload: 'preload2'}
425+
preload: { firstPreload: 'preload1', secondPreload: 'preload2' }
426426
}
427427
}
428428
})
@@ -642,7 +642,7 @@ describe('electron:serve', () => {
642642
test('Main process is recompiled and Electron is relaunched when file in list change', async () => {
643643
// So we can make sure it wasn't called
644644
jest.spyOn(process, 'exit')
645-
let watchCb = {}
645+
const watchCb = {}
646646
chokidar.watch.mockImplementation(files => {
647647
return {
648648
on: (type, cb) => {
@@ -768,7 +768,7 @@ describe('electron:serve', () => {
768768
})
769769

770770
expect(fs.copySync).toBeCalledWith(
771-
`projectPath/./package.json`,
771+
'projectPath/./package.json',
772772
'outputDir/package.json'
773773
)
774774
})
@@ -852,7 +852,7 @@ describe('electron:serve', () => {
852852
const mockRun = jest
853853
.fn()
854854
.mockImplementation((cb) => cb(undefined, { hasErrors: () => false }))
855-
webpack.mockReturnValue({run: mockRun})
855+
webpack.mockReturnValue({ run: mockRun })
856856
await runCommand('electron:build', {
857857
pluginOptions: {
858858
electronBuilder: {
@@ -864,7 +864,7 @@ describe('electron:serve', () => {
864864
expect(webpack).toBeCalledTimes(2)
865865
const preloadWebpackCall = webpack.mock.calls[1][0]
866866
expect(preloadWebpackCall.target).toBe('electron-preload')
867-
expect(preloadWebpackCall.entry).toEqual({preload: ['projectPath/preloadFile']})
867+
expect(preloadWebpackCall.entry).toEqual({ preload: ['projectPath/preloadFile'] })
868868
// Make sure preload bundle has been run
869869
expect(mockRun).toHaveBeenCalledTimes(2)
870870
webpack.mockClear()
@@ -874,11 +874,11 @@ describe('electron:serve', () => {
874874
const mockRun = jest
875875
.fn()
876876
.mockImplementation((cb) => cb(undefined, { hasErrors: () => false }))
877-
webpack.mockReturnValue({run: mockRun})
877+
webpack.mockReturnValue({ run: mockRun })
878878
await runCommand('electron:build', {
879879
pluginOptions: {
880880
electronBuilder: {
881-
preload: {firstPreload: 'preload1', secondPreload: 'preload2'}
881+
preload: { firstPreload: 'preload1', secondPreload: 'preload2' }
882882
}
883883
}
884884
})

0 commit comments

Comments
 (0)