From d8b7fe5a321efe00527440ec9b5152fc329d5c6d Mon Sep 17 00:00:00 2001
From: Lorenzo Pini <Gnafu@users.noreply.github.com>
Date: Wed, 7 Jun 2017 14:41:38 +0200
Subject: [PATCH] Prevents git to change the test-resources files (#1905)

Wait for more than 10 seconds during tests, this should fix the random Travis failures
Ignore documentation folders when running ESLint
---
 .eslintignore                               | 2 ++
 .gitattributes                              | 1 +
 .gitignore                                  | 1 +
 karma.conf.single-run.js                    | 2 +-
 web/client/reducers/__tests__/theme-test.js | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.eslintignore b/.eslintignore
index cf1adc2780..6056a17ebf 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,5 @@
 web/client/dist/
 web/client/libs/Cesium
 web/client/libs/cesium-navigation
+web/docs/
+web/client/mapstore/docs/
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..43a1d23be2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+web/client/test-resources/* -text
diff --git a/.gitignore b/.gitignore
index ac7a81da43..05844147d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ _site
 *.lock
 docs/developer-guide/reference/
 web/client/mapstore/docs/
+web/docs
diff --git a/karma.conf.single-run.js b/karma.conf.single-run.js
index 4c33284bb6..191a5920ee 100644
--- a/karma.conf.single-run.js
+++ b/karma.conf.single-run.js
@@ -3,7 +3,7 @@ module.exports = function karmaConfig(config) {
     config.set({
 
         browsers: [ 'Chrome' ],
-
+        browserNoActivityTimeout: 30000,
         singleRun: true,
 
         frameworks: [ 'mocha' ],
diff --git a/web/client/reducers/__tests__/theme-test.js b/web/client/reducers/__tests__/theme-test.js
index 750bb8a01d..3d12c0b739 100644
--- a/web/client/reducers/__tests__/theme-test.js
+++ b/web/client/reducers/__tests__/theme-test.js
@@ -13,7 +13,7 @@ const {selectTheme} = require('../../actions/theme');
 
 
 describe('Test the theme reducer', () => {
-    it('should maange the THEME_SELECTED action', () => {
+    it('should manage the THEME_SELECTED action', () => {
         var state = theme({}, selectTheme({id: "default"}));
         expect(state.selectedTheme).toExist();
         expect(state.selectedTheme.id).toBe("default");