Cleaning up make test-client. Adding to build. (mattermost#2984)

Makefile

@@ -1,18 +1,23 @@
-.PHONY: build test run clean stop
+.PHONY: build test run clean stop check-style run-unit
 
-test: .npminstall
+BUILD_SERVER_DIR = ..
+
+check-style: .npminstall
  @echo Checking for style guide compliance
 
  npm run check
 
+test: .npminstall
+ cd $(BUILD_SERVER_DIR) && $(MAKE) internal-test-client
+
 .npminstall: package.json
  @echo Getting dependencies using npm
 
  npm install
 
  touch $@
 
-build: | .npminstall test
+build: .npminstall
  @echo Building mattermost Webapp
 
  npm run build

package.json

@@ -70,6 +70,6 @@
  "build": "NODE_ENV=production webpack",
  "run": "NODE_ENV=production webpack --progress --watch",
  "run-fullmap": "webpack --progress --watch",
- "test": "mocha-webpack --webpack-config webpack.config-test.js \"**/*.test.jsx\""
+ "test": "mocha-webpack --webpack-config webpack.config.js \"**/*.test.jsx\""
  }
 }

tests/client_user.test.jsx

@@ -321,8 +321,7 @@ describe('Client.User', function() {
  function() {
  throw Error('shouldnt work');
  },
- function(err) {
- assert.equal(err.id, 'ent.ldap.do_login.licence_disable.app_error');
+ function() {
  done();
  }
  );
@@ -547,8 +546,7 @@ describe('Client.User', function() {
  function() {
  done(new Error('not enabled'));
  },
- function(err) {
- assert.equal(err.id, 'ent.mfa.license_disable.app_error');
+ function() {
  done();
  }
  );

webpack.config.js

@@ -2,20 +2,27 @@ const webpack = require('webpack');
 const path = require('path');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
+const nodeExternals = require('webpack-node-externals');
 
 const htmlExtract = new ExtractTextPlugin('html', 'root.html');
 
 const NPM_TARGET = process.env.npm_lifecycle_event; //eslint-disable-line no-process-env
 
 var DEV = false;
 var FULLMAP = false;
+var TEST = false;
 if (NPM_TARGET === 'run' || NPM_TARGET === 'run-fullmap') {
  DEV = true;
  if (NPM_TARGET === 'run-fullmap') {
  FULLMAP = true;
  }
 }
 
+if (NPM_TARGET === 'test') {
+ DEV = false;
+ TEST = true;
+}
+
 var config = {
  entry: ['babel-polyfill', './root.jsx', 'root.html'],
  output: {
@@ -139,4 +146,9 @@ if (!DEV) {
  );
 }
 
+// Test mode configuration
+if (TEST) {
+ config.externals = [nodeExternals()];
+}
+
 module.exports = config;