From ddc8f14a532b2f87c7a386c93198c326976a2167 Mon Sep 17 00:00:00 2001 From: Matthew McNamara Date: Wed, 18 Feb 2015 21:50:24 +0000 Subject: [PATCH] Ignore bower_components in watcher, increased timeout for tests for slow VMs --- lib/bundles/watcher.js | 9 +++++---- test/setup.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/bundles/watcher.js b/lib/bundles/watcher.js index 789bff951..85eb35d37 100644 --- a/lib/bundles/watcher.js +++ b/lib/bundles/watcher.js @@ -10,10 +10,11 @@ require('string.prototype.endswith'); // Patterns for gaze to watch or ignore var watchPatterns = [ - 'bundles/**', // Watch bundles folder - '!**/*___jb_*___', // Ignore temp files created by JetBrains IDEs - '!bundles/*/view/**', // Ignore view folders. Might watch them in a later NodeCG version, but not now. - '!**/node_modules/**' // Ignore node_modules folders + 'bundles/**', // Watch bundles folder + '!**/*___jb_*___', // Ignore temp files created by JetBrains IDEs + '!bundles/*/view/**', // Ignore view folders. Might watch them in a later NodeCG version, but not now. + '!**/node_modules/**', // Ignore node_modules folders + '!**/bower_components/**' // Ignore bower_components folders ]; var watcher = chokidar.watch(watchPatterns, { diff --git a/test/setup.js b/test/setup.js index 96e7286fc..129d8087f 100644 --- a/test/setup.js +++ b/test/setup.js @@ -8,7 +8,7 @@ var C = require('./setup/test-constants'); // Global before and after before(function(done) { - this.timeout(15000); + this.timeout(30000); if (C.CONFIG.login.enabled) { throw new Error('Login security is enabled! Please disable login security in cfg/nodecg.json before running tests');