12 files changed, 13 insertions, 78 deletions
diff --git a/webapp/tests/.eslintrc.json b/webapp/tests/.eslintrc.json
new file mode 100644
index 000000000..c2d57abea
--- /dev/null
+++ b/webapp/tests/.eslintrc.json
@@ -0,0 +1,12 @@
+{
+    "rules": {
+        "no-console": 0,
+        "global-require": 0,
+        "func-names": 0,
+        "prefer-arrow-callback": 0,
+        "no-magic-numbers": 0,
+        "no-unreachable": 0,
+        "new-cap": 0,
+        "max-nested-callbacks": 0
+    }
+}
diff --git a/webapp/tests/client_channel.test.jsx b/webapp/tests/client_channel.test.jsx
index 9d88f3de0..6b66173a5 100644
--- a/webapp/tests/client_channel.test.jsx
+++ b/webapp/tests/client_channel.test.jsx
@@ -1,13 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
-
 import assert from 'assert';
 import TestHelper from './test_helper.jsx';
 
diff --git a/webapp/tests/client_command.test.jsx b/webapp/tests/client_command.test.jsx
index f7f0d2b25..769fa2fa0 100644
--- a/webapp/tests/client_command.test.jsx
+++ b/webapp/tests/client_command.test.jsx
@@ -1,13 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
-
 import assert from 'assert';
 import TestHelper from './test_helper.jsx';
 
diff --git a/webapp/tests/client_general.test.jsx b/webapp/tests/client_general.test.jsx
index 870c11257..d18927445 100644
--- a/webapp/tests/client_general.test.jsx
+++ b/webapp/tests/client_general.test.jsx
@@ -1,13 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
-
 var assert = require('assert');
 import TestHelper from './test_helper.jsx';
 
diff --git a/webapp/tests/client_hooks.test.jsx b/webapp/tests/client_hooks.test.jsx
index 0cad22153..8d09802a9 100644
--- a/webapp/tests/client_hooks.test.jsx
+++ b/webapp/tests/client_hooks.test.jsx
@@ -1,13 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
-
 import assert from 'assert';
 import TestHelper from './test_helper.jsx';
 
diff --git a/webapp/tests/client_oauth.test.jsx b/webapp/tests/client_oauth.test.jsx
index df2fc665b..a9a6bd919 100644
--- a/webapp/tests/client_oauth.test.jsx
+++ b/webapp/tests/client_oauth.test.jsx
@@ -1,13 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
-
 import assert from 'assert';
 import TestHelper from './test_helper.jsx';
 
diff --git a/webapp/tests/client_post.test.jsx b/webapp/tests/client_post.test.jsx
index c8e6fad0f..3c6f05c9f 100644
--- a/webapp/tests/client_post.test.jsx
+++ b/webapp/tests/client_post.test.jsx
@@ -1,13 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
-
 import assert from 'assert';
 import TestHelper from './test_helper.jsx';
 
diff --git a/webapp/tests/client_preferences.test.jsx b/webapp/tests/client_preferences.test.jsx
index 987728704..95b026bfc 100644
--- a/webapp/tests/client_preferences.test.jsx
+++ b/webapp/tests/client_preferences.test.jsx
@@ -1,13 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
-
 import assert from 'assert';
 import TestHelper from './test_helper.jsx';
 
diff --git a/webapp/tests/client_team.test.jsx b/webapp/tests/client_team.test.jsx
index e8b71d2f8..3179e9f69 100644
--- a/webapp/tests/client_team.test.jsx
+++ b/webapp/tests/client_team.test.jsx
@@ -1,13 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
-
 import assert from 'assert';
 import TestHelper from './test_helper.jsx';
 
diff --git a/webapp/tests/client_user.test.jsx b/webapp/tests/client_user.test.jsx
index 621be6c6a..9dc875e9d 100644
--- a/webapp/tests/client_user.test.jsx
+++ b/webapp/tests/client_user.test.jsx
@@ -1,13 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
-
 import assert from 'assert';
 import TestHelper from './test_helper.jsx';
 
diff --git a/webapp/tests/spinner_button.test.jsx b/webapp/tests/spinner_button.test.jsx
index 0e282e0ee..68488b61d 100644
--- a/webapp/tests/spinner_button.test.jsx
+++ b/webapp/tests/spinner_button.test.jsx
@@ -1,9 +1,3 @@
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
 
 var jsdom = require('mocha-jsdom');
 var assert = require('assert');
@@ -21,4 +15,4 @@ describe('SpinnerButton', function() {
 
         assert.equal(spinner.props.spinning, false, 'should start in the default false state');
     });
-});
-\ No newline at end of file
+});
diff --git a/webapp/tests/test_helper.jsx b/webapp/tests/test_helper.jsx
index f19d96433..4352096a1 100644
--- a/webapp/tests/test_helper.jsx
+++ b/webapp/tests/test_helper.jsx
@@ -1,14 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-/* eslint-disable no-console */
-/* eslint-disable global-require */
-/* eslint-disable func-names */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable no-magic-numbers */
-/* eslint-disable no-unreachable */
-/* eslint-disable new-cap */
-
 import Client from '../client/client.jsx';
 import jqd from 'jquery-deferred';