Merge pull request #28 from backflip/feature/error-handling

Issue #20: Templating step: Throw gulp-util's PluginError instead of …
backflip · Aug 2, 2015 · 068c088 · 068c088
2 parents 6395438 + 3c8e3ba
commit 068c088
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -93,15 +93,14 @@ function iconfontCSS(config) {
 
 	stream._flush = function(cb) {
 		var content;
-
 		if (glyphMap.length) {
 			consolidate[config.engine](config.path, {
 					glyphs: glyphMap,
 					fontName: config.fontName,
 					fontPath: config.fontPath
-				}, function(error, html) {
-					if (error) {
-						throw error;
+				}, function(err, html) {
+					if (err) {
+						throw new gutil.PluginError(PLUGIN_NAME, 'Error in template: ' + err.message);
 					}
 
 					content = Buffer(html);

diff --git a/test/main.js b/test/main.js
@@ -6,22 +6,25 @@ var gulp = require('gulp'),
 
 describe('gulp-iconfont-css', function() {
 	function testType(type, name) {
-		var resultsDir = __dirname + '/results_'+type;
-		it('should generate '+name+' file', function(done) {
+		var resultsDir = __dirname + '/results_' + type;
+
+		it('should generate ' + name + ' file', function(done) {
 			gulp.src(__dirname + '/fixtures/icons/*.svg')
 				.pipe(iconfontCss({
 					fontName: 'Icons',
 					path: type,
-					targetPath: '../_icons.'+type
+					targetPath: '../_icons.' + type
+				}).on('error', function(err) {
+					console.log(err);
 				}))
 				.pipe(gulp.dest(resultsDir + '/icons/'))
 				.pipe(es.wait(function() {
 					assert.equal(
-						fs.readFileSync(resultsDir + '/_icons.'+type, 'utf8'),
-						fs.readFileSync(__dirname + '/expected/_icons.'+type, 'utf8')
+						fs.readFileSync(resultsDir + '/_icons.' + type, 'utf8'),
+						fs.readFileSync(__dirname + '/expected/_icons.' + type, 'utf8')
 					);
 
-					fs.unlinkSync(resultsDir + '/_icons.'+type);
+					fs.unlinkSync(resultsDir + '/_icons.' + type);
 					fs.unlinkSync(resultsDir + '/icons/uE001-github.svg');
 					fs.unlinkSync(resultsDir + '/icons/uE002-twitter.svg');
 					fs.rmdirSync(resultsDir + '/icons/');
@@ -35,5 +38,4 @@ describe('gulp-iconfont-css', function() {
 	testType('scss', 'SCSS');
 	testType('less', 'Less');
 	testType('css', 'CSS');
-
 });