test for bad export types

test/function/export-type-mismatch-b/_config.js

@@ -0,0 +1,11 @@
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 'export type must be auto, default, named or none',
+	bundleOptions: {
+		exports: 'blah'
+	},
+	generateError: function ( err ) {
+		assert.ok( /options\.exports must be 'default', 'named', 'none', 'auto', or left unspecified/.test( err.message ) );
+	}
+};

test/function/export-type-mismatch-b/main.js

@@ -0,0 +1 @@
+export default 42;

test/function/export-type-mismatch-c/_config.js

@@ -0,0 +1,11 @@
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 'cannot have named exports if explicit export type is default',
+	bundleOptions: {
+		exports: 'none'
+	},
+	generateError: function ( err ) {
+		assert.ok( /'none' was specified for options\.exports/.test( err.message ) );
+	}
+};

test/function/export-type-mismatch-c/main.js

@@ -0,0 +1 @@
+export default 42;

test/function/export-type-mismatch/_config.js

@@ -0,0 +1,11 @@
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 'cannot have named exports if explicit export type is default',
+	bundleOptions: {
+		exports: 'default'
+	},
+	generateError: function ( err ) {
+		assert.ok( /'default' was specified for options\.exports/.test( err.message ) );
+	}
+};

test/function/export-type-mismatch/main.js

@@ -0,0 +1 @@
+export var foo = 42;

test/test.js

@@ -110,22 +110,22 @@ describe( 'rollup', function () {
 								format: 'cjs'
 							}));
 
-							if ( config.error ) {
+							if ( config.generateError ) {
 								unintendedError = new Error( 'Expected an error while generating output' );
 							}
 						} catch ( err ) {
-							if ( config.error ) {
-								config.error( err );
+							if ( config.generateError ) {
+								config.generateError( err );
 							} else {
 								unintendedError = err;
 							}
 						}
 
 						if ( unintendedError ) throw unintendedError;
+						if ( config.error || config.generateError ) return;
 
 						var code;
 
-						try {
 						if ( config.babel ) {
 							code = babel.transform( result.code, {
 								blacklist: [ 'es6.modules' ],
@@ -160,13 +160,6 @@ describe( 'rollup', function () {
 
 						if ( config.exports ) config.exports( module.exports );
 						if ( config.bundle ) config.bundle( bundle );
-						} catch ( err ) {
-							if ( config.error ) {
-								config.error( err );
-							} else {
-								unintendedError = err;
-							}
-						}
 
 						if ( config.show || unintendedError ) {
 							console.log( code + '\n\n\n' );