test: set default language for spellchecker

.gitignore

@@ -26,6 +26,7 @@ yarn-error.log*
 config.gypi
 
 # Test generated files
-tests/package.json
+tests/e2e/package.json
+coverage
 
 .python-version

appveyor.yml

@@ -6,7 +6,7 @@ os: Previous Visual Studio 2015
 
 cache:
   - node_modules
-  
+
 install:
   - ps: Install-Product node 6 x64
   - git reset --hard HEAD
@@ -20,5 +20,4 @@ install:
 build: off
 
 test_script:
-  - npm run test
+  - npm run test-all
-  - npm run test-e2e

gulpfile.js

@@ -30,7 +30,7 @@ gulp.task('reload:renderer', done => {
 });
 
 gulp.task('test-e2e', () => {
-	return gulp.src('tests/*.js')
+	return gulp.src('tests/e2e/*.js')
 	.pipe(tape({
 		reporter: tapColorize()
 	}));

karma.conf.js

@@ -0,0 +1,21 @@
+module.exports = function (config) {
+	config.set({
+		basePath: '',
+		frameworks: ['jasmine'],
+		browsers: ['Electron'],
+		preprocessors: {
+			'**/*.js': ['electron']
+		},
+		files: [
+			{pattern: './karma.shim.js', watched: true, included: true, served: true},
+			{pattern: './tests/unit/*.js', watched: true, included: true, served: true},
+			{pattern: './app/renderer/**/*.js', watched: true, included: false, served: true}
+		],
+		reporters: ['mocha'],
+		client: {
+			captureConsole: true,
+			useIframe: false
+		},
+		singleRun: true
+	});
+};

karma.shim.js

@@ -0,0 +1,5 @@
+window.require = window.parent.require;
+window.process = window.parent.process;
+window.__dirname = window.parent.__dirname;
+require('module').globalPaths.push('./node_modules');
+require('module').globalPaths.push('./app/renderer');

package.json

@@ -21,8 +21,10 @@
     "start": "electron app --disable-http-cache",
     "reinstall": "rm -rf node_modules; rm -rf app/node_modules; npm install",
     "postinstall": "electron-builder install-app-deps",
-    "test": "xo",
+    "lint": "xo",
     "test-e2e": "gulp test-e2e",
+    "test-unit": "karma start karma.conf.js",
+    "test-all": "xo && npm run test-unit && npm run test-e2e",
     "dev": "gulp dev",
     "pack": "electron-builder --dir",
     "dist": "electron-builder",
@@ -30,7 +32,7 @@
     "travis": "cd ./scripts && ./travis-build-test.sh"
   },
   "pre-commit": [
-    "test"
+    "lint"
   ],
   "build": {
     "appId": "org.zulip.zulip-electron",
@@ -116,10 +118,17 @@
     "gulp": "3.9.1",
     "gulp-tape": "0.0.9",
     "is-ci": "^1.0.10",
+    "jasmine": "^2.8.0",
+    "karma": "^1.7.1",
+    "karma-electron": "^5.2.2",
+    "karma-electron-launcher": "^0.2.0",
+    "karma-jasmine": "^1.1.0",
+    "karma-mocha-reporter": "^2.2.5",
     "pre-commit": "1.2.2",
     "spectron": "3.7.2",
     "tap-colorize": "^1.2.0",
     "tape": "^4.8.0",
+    "watchify": "^3.9.0",
     "xo": "0.18.2"
   },
   "xo": {
@@ -153,7 +162,8 @@
       }
     ],
     "ignore": [
-      "tests/*.js"
+      "tests/e2e/*.js",
+      "tests/unit/*"
     ],
     "envs": [
       "node",

scripts/travis-build-test.sh

@@ -10,8 +10,14 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     xdpyinfo | grep dimensions
 fi
 
-npm run test
+# macOS
-
+# Run all the tests
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    npm run test-e2e
+    npm run test-all
+fi
+
+# Linux
+# Only run linting test on Linux
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    npm run lint
 fi

tests/e2e/setup.js

@@ -22,7 +22,7 @@ module.exports = {
 function createApp (t) {
   generateTestAppPackageJson()
   return new Application({
-    path: path.join(__dirname, '..', 'node_modules', '.bin',
+    path: path.join(__dirname,'..', '..', 'node_modules', '.bin',
       'electron' + (process.platform === 'win32' ? '.cmd' : '')),
     args: [path.join(__dirname)], // Ensure this dir has a package.json file with a 'main' entry piont
     env: {NODE_ENV: 'test'},
@@ -34,9 +34,9 @@ function createApp (t) {
 // Reads app package.json and updates the productName to config.TEST_APP_PRODUCT_NAME 
 // We do this so that the app integration doesn't doesn't share the same appDataDir as the dev application
 function generateTestAppPackageJson () {
-  let packageJson = require(path.join(__dirname, '../package.json'))
+  let packageJson = require(path.join(__dirname, '..', '..', 'package.json'))
   packageJson.productName = config.TEST_APP_PRODUCT_NAME
-  packageJson.main = '../app/main'
+  packageJson.main = '../../app/main'
 
   const testPackageJsonPath = path.join(__dirname, 'package.json')
   fs.writeFileSync(testPackageJsonPath, JSON.stringify(packageJson, null, ' '), 'utf-8')

tests/unit/test-spellchecker.js

@@ -0,0 +1,20 @@
+const ConfigUtil = require('js/utils/config-util.js');
+const SetupSpellChecker = require('js/spellchecker')
+
+describe('test spell checker', function () {
+  // enable spellchecker settings
+  ConfigUtil.setConfigItem('enableSpellchecker', true);
+  ConfigUtil.setConfigItem('spellcheckerLanguage', 'en');
+
+  SetupSpellChecker.init()  // re-initialize after setting update
+
+  const spellCheckHandler = SetupSpellChecker.SpellCheckHandler
+
+  it('mark misspelled word', function () {
+    expect(spellCheckHandler.isMisspelled('helpe')).toBe(true)
+  })
+
+  it('verify properly spelled word', function () {
+    expect(spellCheckHandler.isMisspelled('help')).toBe(false)
+  })
+})