Ignore bower_components in watcher, increased timeout for tests for s…

…low VMs
nodecg · Feb 18, 2015 · ddc8f14 · ddc8f14
1 parent c056fa2
commit ddc8f14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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');