Skip to content

Commit

Permalink
Prevents git to change the test-resources files (#1905)
Browse files Browse the repository at this point in the history
Wait for more than 10 seconds during tests, this should fix the random Travis failures
Ignore documentation folders when running ESLint
  • Loading branch information
Gnafu authored and offtherailz committed Jun 7, 2017
1 parent 0794c5a commit d8b7fe5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
@@ -1,3 +1,5 @@
web/client/dist/
web/client/libs/Cesium
web/client/libs/cesium-navigation
web/docs/
web/client/mapstore/docs/
1 change: 1 addition & 0 deletions .gitattributes
@@ -0,0 +1 @@
web/client/test-resources/* -text
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -17,3 +17,4 @@ _site
*.lock
docs/developer-guide/reference/
web/client/mapstore/docs/
web/docs
2 changes: 1 addition & 1 deletion karma.conf.single-run.js
Expand Up @@ -3,7 +3,7 @@ module.exports = function karmaConfig(config) {
config.set({

browsers: [ 'Chrome' ],

browserNoActivityTimeout: 30000,
singleRun: true,

frameworks: [ 'mocha' ],
Expand Down
2 changes: 1 addition & 1 deletion web/client/reducers/__tests__/theme-test.js
Expand Up @@ -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");
Expand Down

0 comments on commit d8b7fe5

Please sign in to comment.