Fix tests and improve CI

.electron-vue/webpack.renderer.config.js

@@ -172,13 +172,18 @@ const rendererConfig = {
  */
 if (process.env.NODE_ENV !== 'production') {
   rendererConfig.plugins.push(
-    new BundleAnalyzerPlugin(),
     new webpack.DefinePlugin({
       '__static': `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"`
     })
   )
 }
 
+if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test') {
+  rendererConfig.plugins.push(
+    new BundleAnalyzerPlugin()
+  )
+}
+
 /**
  * Adjust rendererConfig for production settings
  */

.eslintrc.js

@@ -2,24 +2,35 @@ module.exports = {
   root: true,
   parser: 'babel-eslint',
   parserOptions: {
+    ecmaFeatures: {
+      impliedStrict: true
+    },
     sourceType: 'module'
   },
   env: {
     browser: true,
+    es6: true,
     node: true
   },
-  extends: 'standard',
+  extends: [
+    'standard',
+    'eslint:recommended',
+    'plugin:vue/base' // 'plugin:vue/essential'
+  ],
   globals: {
     __static: true
   },
   plugins: [
-    'html'
+    'html',
+    'vue'
   ],
-  'rules': {
+  rules: {
     // allow paren-less arrow functions
     'arrow-parens': 0,
     // allow async-await
     'generator-star-spacing': 0,
+    // allow console
+    'no-console': 0,
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
   }

.travis.yml

@@ -1,20 +1,17 @@
-# Commented sections below can be used to run tests on the CI server
-# https://simulatedgreg.gitbooks.io/electron-vue/content/en/testing.html#on-the-subject-of-ci-testing
-osx_image: xcode9.2
 sudo: required
-dist: trusty
-
 language: node_js
 node_js:
   - 8
 
 matrix:
   include:
   - os: osx
-    env: CC=clang CXX=clang++ npm_config_clang=1 MARKTEXT_IS_OFFICIAL_RELEASE=1
+    osx_image: xcode9.2
+    env: CC=clang CXX=clang++ npm_config_clang=1 MARKTEXT_IS_OFFICIAL_RELEASE=1 MARKTEXT_EXIT_ON_ERROR=1
     compiler: clang
   - os: linux
-    env: CC=clang CXX=clang++ npm_config_clang=1 MARKTEXT_IS_OFFICIAL_RELEASE=1
+    dist: trusty
+    env: CC=clang CXX=clang++ npm_config_clang=1 MARKTEXT_IS_OFFICIAL_RELEASE=1 MARKTEXT_EXIT_ON_ERROR=1 DISPLAY=:99.0
     compiler: clang
 
 cache:
@@ -30,28 +27,19 @@ addons:
     - icnsutils
     - graphicsmagick
     - xz-utils
-    #- xvfb
+    - xvfb
     # atom/keyboard-layout
     - libx11-dev
     - libxkbfile-dev
 
 before_install:
-  #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update ; fi
-  #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-  #    wget -qO - https://dl.winehq.org/wine-builds/Release.key | sudo apt-key add -;
-  #    sudo apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/;
-  #  fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update ; fi
-  #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install --install-recommends winehq-stable ; fi
 
   #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
 
 install:
-  #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=':99.0' ; fi
-  #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & ; fi
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - source ~/.bashrc
-  - npm install -g xvfb-maybe
 
   - $CC --version
   - $CXX --version
@@ -61,13 +49,17 @@ install:
   - yarn
 
 script:
-  #- xvfb-maybe node_modules/.bin/karma start test/unit/karma.conf.js
-  #- yarn run pack && xvfb-maybe node_modules/.bin/mocha test/e2e
   - yarn run lint
+
+  # Unit and e2e tests
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then xvfb-run --server-args="-screen 0 1024x768x24" yarn run test ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then yarn run test ; fi
+
+  # Build binaries
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then yarn run release:linux ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then yarn run release:mac ; fi
 
-  # calculate checksums
+  # Calculate checksums
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sha256sum build/marktext-*-x64.tar.gz ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sha256sum build/marktext-*-x86_64.AppImage ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then shasum -a 256 build/Mark\ Text-*-mac.zip ; fi

appveyor.yml

@@ -14,6 +14,7 @@ skip_tags: true
 
 environment:
   MARKTEXT_IS_OFFICIAL_RELEASE: 1
+  MARKTEXT_EXIT_ON_ERROR: 1
   GH_TOKEN:
     secure: Ki5AJWygDYhzMJxl0b0rDx3bhAYmar2aPdwVHiai9IigqsvZpWHLeI3qpTiiaOWL
 
@@ -22,7 +23,6 @@ init:
 
 install:
   - ps: Install-Product node 8 $env:PLATFORM
-  - choco install yarn --ignore-dependencies
 
   - node --version
   - npm --version
@@ -38,6 +38,8 @@ cache:
 
 build_script:
   - yarn run lint
+  - yarn run test
+
   - yarn run release:win
 
   # calculate checksums
@@ -46,4 +48,4 @@ build_script:
 
 test: off
 # test_script:
-#   - yarn test
+#   - yarn run test