chore: separate e2e and unit tests

License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>

.travis.yml

@@ -21,8 +21,9 @@ before_script:
     fi
 
 script:
-  - npm run test
   - npm run lint
+  - npm run test
+  - npm run test:e2e
   - npm run build
 
 notifications:

appveyor.yml

@@ -17,8 +17,9 @@ install:
   - npm install
 
 build_script:
-  - npm run test
   - npm run lint
+  - npm run test
+  - npm run test:e2e
   - npm run build
 
 test: off

package.json

@@ -8,7 +8,8 @@
   "scripts": {
     "start": "cross-env NODE_ENV=development electron -r @babel/register src/index.js",
     "lint": "standard",
-    "test": "cross-env NODE_ENV=test mocha -r @babel/register",
+    "test": "cross-env NODE_ENV=test mocha test/unit/**/*.spec.js -r @babel/register",
+    "test:e2e": "xvfb-maybe cross-env NODE_ENV=test mocha test/e2e/**/*.e2e.js -r @babel/register",
     "postinstall": "run-s install-app-deps build:webui",
     "install-app-deps": "electron-builder install-app-deps",
     "clean:webui": "shx rm -rf assets/webui/",
@@ -70,7 +71,8 @@
     "spectron": "^8.0.0",
     "standard": "^14.1.0",
     "tar": "^4.4.10",
-    "tmp": "0.1.0"
+    "tmp": "0.1.0",
+    "xvfb-maybe": "^0.2.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",

test/launch.spec.js → test/e2e/launch.e2e.js

@@ -39,7 +39,7 @@ describe('Application launch', function () {
   }) {
     app = new Application({
       path: electronPath,
-      args: ['-r', path.join(__dirname, 'utils/include.js'), path.join(__dirname, '../src/index.js')],
+      args: ['-r', path.join(__dirname, 'utils/include.js'), path.join(__dirname, '../../src/index.js')],
       env: {
         NODE_ENV: 'test',
         HOME: home,

test/create-toggler.spec.js → test/unit/create-toggler.spec.js

@@ -18,7 +18,7 @@ describe('Create toggler', () => {
     electron = mockElectron()
     store = mockStore()
     webui = mockWebUI()
-    createToggler = proxyquire('../src/create-toggler', {
+    createToggler = proxyquire('../../src/create-toggler', {
       electron: electron,
       './common/store': store
     }).default

test/dock.spec.js → test/unit/dock.spec.js

@@ -14,21 +14,21 @@ chai.use(dirtyChai)
 describe('Dock', () => {
   it('show dock succeeds with dock (macOS)', () => {
     const electron = mockElectron({ withDock: true })
-    const { show } = proxyquire('../src/dock', { electron }).default
+    const { show } = proxyquire('../../src/dock', { electron }).default
     show()
     expect(electron.app.dock.show.callCount).to.equal(1)
   })
 
   it('show dock succeeds without dock (other OSes)', () => {
     const electron = mockElectron()
-    const { show } = proxyquire('../src/dock', { electron }).default
+    const { show } = proxyquire('../../src/dock', { electron }).default
     show()
   })
 
   it('hide dock succeeds with dock and no windows (macOS)', () => {
     const electron = mockElectron({ withDock: true })
     electron.BrowserWindow.getAllWindows.returns([])
-    const { hide } = proxyquire('../src/dock', { electron }).default
+    const { hide } = proxyquire('../../src/dock', { electron }).default
     hide()
     expect(electron.app.dock.hide.callCount).to.equal(1)
   })
@@ -40,7 +40,7 @@ describe('Dock', () => {
       { isVisible: sinon.stub().returns(false) }
     ]
     electron.BrowserWindow.getAllWindows.returns(windows)
-    const { hide } = proxyquire('../src/dock', { electron }).default
+    const { hide } = proxyquire('../../src/dock', { electron }).default
     hide()
     expect(windows[0].isVisible.callCount).to.equal(1)
     expect(windows[1].isVisible.callCount).to.equal(1)
@@ -54,7 +54,7 @@ describe('Dock', () => {
       { isVisible: sinon.stub().returns(false) }
     ]
     electron.BrowserWindow.getAllWindows.returns(windows)
-    const { hide } = proxyquire('../src/dock', { electron }).default
+    const { hide } = proxyquire('../../src/dock', { electron }).default
     hide()
     expect(windows[0].isVisible.callCount).to.equal(1)
     expect(windows[1].isVisible.callCount).to.equal(1)
@@ -63,14 +63,14 @@ describe('Dock', () => {
 
   it('hide dock succeeds without dock (other OSes)', () => {
     const electron = mockElectron()
-    const { hide } = proxyquire('../src/dock', { electron }).default
+    const { hide } = proxyquire('../../src/dock', { electron }).default
     hide()
   })
 
   it('runs async function with dock (macOS)', async () => {
     const electron = mockElectron({ withDock: true })
     electron.BrowserWindow.getAllWindows.returns([])
-    const { run } = proxyquire('../src/dock', { electron }).default
+    const { run } = proxyquire('../../src/dock', { electron }).default
     const fn = sinon.stub().resolves(5)
     const res = await run(fn)
     expect(res).to.equal(5)
@@ -82,7 +82,7 @@ describe('Dock', () => {
   it('runs async function without dock (other OSes)', async () => {
     const electron = mockElectron()
     electron.BrowserWindow.getAllWindows.returns([])
-    const { run } = proxyquire('../src/dock', { electron }).default
+    const { run } = proxyquire('../../src/dock', { electron }).default
     const fn = sinon.stub().resolves(5)
     const res = await run(fn)
     expect(res).to.equal(5)
@@ -91,7 +91,7 @@ describe('Dock', () => {
   it('runs sync function with dock (macOS)', () => {
     const electron = mockElectron({ withDock: true })
     electron.BrowserWindow.getAllWindows.returns([])
-    const { runSync } = proxyquire('../src/dock', { electron }).default
+    const { runSync } = proxyquire('../../src/dock', { electron }).default
     const fn = sinon.stub().returns(5)
     const res = runSync(fn)
     expect(res).to.equal(5)
@@ -103,7 +103,7 @@ describe('Dock', () => {
   it('runs sync function without dock (other OSes)', () => {
     const electron = mockElectron()
     electron.BrowserWindow.getAllWindows.returns([])
-    const { runSync } = proxyquire('../src/dock', { electron }).default
+    const { runSync } = proxyquire('../../src/dock', { electron }).default
     const fn = sinon.stub().returns(5)
     const res = runSync(fn)
     expect(res).to.equal(5)