test syntax in bundle_tests/ files

Author: etpinard

tasks/test_bundle.js

@@ -2,11 +2,12 @@ var path = require('path');
 var exec = require('child_process').exec;
 
 var glob = require('glob');
+
 var constants = require('./util/constants');
-var pathToBundleTests = path.join(constants.pathToJasmineTests, '..', 'bundle_tests');
+var pathToJasmineBundleTests= path.join(constants.pathToJasmineBundleTests);
 
 
-glob(pathToBundleTests + '/*.js', function(err, files) {
+glob(pathToJasmineBundleTests + '/*.js', function(err, files) {
     files.forEach(function(file) {
         var baseName = path.basename(file);
         var cmd = 'npm run citest-jasmine -- bundle_tests/' + baseName;

tasks/util/constants.js

@@ -48,6 +48,7 @@ module.exports = {
     pathToTestImagesDiffList: path.join(pathToBuild, 'list_of_incorrect_images.txt'),
 
     pathToJasmineTests: path.join(pathToRoot, 'test/jasmine/tests'),
+    pathToJasmineBundleTests: path.join(pathToRoot, 'test/jasmine/bundle_tests'),
 
     uglifyOptions: {
         fromString: true,

test/syntax_test.js

@@ -6,16 +6,19 @@ var glob = require('glob');
 
 var constants = require('../tasks/util/constants');
 
-var focusGlobals = ['fdescribe', 'fit', 'xdescribe', 'xit'];
+var BLACK_LIST = ['fdescribe', 'fit', 'xdescribe', 'xit'];
 var logs = [];
 
+var testGlob = path.join(constants.pathToJasmineTests, '**/*.js');
+var bundleTestGlob = path.join(constants.pathToJasmineBundleTests, '**/*.js');
 
-glob(path.join(constants.pathToJasmineTests, '**/*.js'), function(err, files) {
+
+glob('{' + testGlob + ',' + bundleTestGlob + '}', function(err, files) {
     files.forEach(function(file) {
         var code = fs.readFileSync(file, 'utf-8');
 
         falafel(code, {locations: true}, function(node) {
-            if(node.type === 'Identifier' && focusGlobals.indexOf(node.name) !== -1) {
+            if(node.type === 'Identifier' && BLACK_LIST.indexOf(node.name) !== -1) {
                 logs.push([
                     path.basename(file),
                     '[line ' + node.loc.start.line + '] :',