Merge pull request #860 from opencomponents/cleanup

Housekeeping

.gitignore

@@ -29,6 +29,16 @@ src/components/base-component-jade/_package
 
 test/fixtures/test.tar.gz
 test/fixtures/targz-test
+test/fixtures/components/container-with-multiple-nested/_package
+test/fixtures/components/container-with-nested/_package
+test/fixtures/components/hello-world/_package
+test/fixtures/components/hello-world-custom-headers/_package
+test/fixtures/components/jade-filters/_package
+test/fixtures/components/language/_package
+test/fixtures/components/lodash-component/_package
+test/fixtures/components/no-containers/_package
+test/fixtures/components/welcome/_package
+test/fixtures/components/welcome-with-optional-parameters/_package
 
 logintervals.md
 

tasks/mochaTest.js

@@ -1,13 +1,17 @@
 'use strict';
 
 const async = require('async');
+const fs = require('fs-extra');
 const glob = require('glob');
+const log = require('./logger');
 const Mocha = require('mocha');
 const minimist = require('minimist');
+const oc = require('../src');
 const path = require('path');
 
 const mocha = new Mocha({ timeout: 20000 });
 const argv = minimist(process.argv.slice(2), { boolean: 'silent' });
+const componentsFixturesPath = './test/fixtures/components';
 const testDirs = [
  'test/unit/**/*.js',
  'test/integration/**/*.js',
@@ -18,15 +22,34 @@ if (argv.silent) {
  mocha.reporter('progress');
 }
 
-async.each(
- testDirs,
- (dir, next) => {
- glob(path.join(__dirname, '..', dir), (err, files) => {
- files.forEach(file => mocha.addFile(file));
- next();
- });
- },
- () => {
- mocha.run(err => process.on('exit', () => process.exit(err)));
+const componentsToPackage = fs
+ .readdirSync(componentsFixturesPath)
+ .filter(x => x !== 'handlebars3-component');
+
+const packageComponent = (componentName, done) =>
+ oc.cli.package(
+ {
+ componentPath: path.join(componentsFixturesPath, componentName),
+ compress: false
+ },
+ err => done(err)
+ );
+
+const addTestSuite = (dir, done) =>
+ glob(path.join(__dirname, '..', dir), (err, files) => {
+ files.forEach(file => mocha.addFile(file));
+ done();
+ });
+
+async.eachSeries(componentsToPackage, packageComponent, err => {
+ if (err) {
+ log.error(`Error during test components packaging: ${err}`);
+ process.exit(1);
+ } else {
+ log.complete(`Test components packaged`);
  }
-);
+
+ async.each(testDirs, addTestSuite, () =>
+ mocha.run(err => process.on('exit', () => process.exit(err)))
+ );
+});