update tests to reflect proposed 0.20.0 API

test/function/custom-external-resolver-async/_config.js

@@ -5,9 +5,11 @@ var Promise = require( 'sander' ).Promise;
 module.exports = {
 	description: 'uses a custom external path resolver (asynchronous)',
 	options: {
-		resolveExternal: function ( id, importer, options ) {
+		plugins: [{
-			return Promise.resolve( path.resolve( __dirname, 'js_modules', id + '.js' ) );
+			resolveId: function ( id, importer ) {
+				if ( importer && id[0] !== '.' ) return Promise.resolve( path.resolve( __dirname, 'js_modules', id + '.js' ) );
 			}
+		}]
 	},
 	exports: function ( exports ) {
 		assert.ok( exports.success );

test/function/custom-external-resolver-sync/_config.js

@@ -4,9 +4,11 @@ var assert = require( 'assert' );
 module.exports = {
 	description: 'uses a custom external path resolver (synchronous)',
 	options: {
-		resolveExternal: function ( id, importer, options ) {
+		plugins: [{
-			return path.resolve( __dirname, 'js_modules', id + '.js' );
+			resolveId: function ( id, importer ) {
+				if ( importer && id[0] !== '.' ) return path.resolve( __dirname, 'js_modules', id + '.js' );
 			}
+		}]
 	},
 	exports: function ( exports ) {
 		assert.ok( exports.success );

test/function/custom-loaders/_config.js

@@ -3,17 +3,21 @@ var fs = require( 'fs' );
 module.exports = {
 	description: 'uses custom loaders, falling back to default',
 	options: {
-		load: [
+		plugins: [
-			function ( id ) {
+			{
+				load: function ( id ) {
 					if ( /foo\.js/.test( id ) ) {
 						return fs.readFileSync( id, 'utf-8' ).replace( '@', 1 );
 					}
+				}
 			},
-			function ( id ) {
+			{
+				load: function ( id ) {
 					if ( /bar\.js/.test( id ) ) {
 						return fs.readFileSync( id, 'utf-8' ).replace( '@', 2 );
 					}
 				}
+			}
 		]
 	}
 };

test/function/custom-path-resolver-async/_config.js

@@ -4,6 +4,7 @@ var assert = require( 'assert' );
 module.exports = {
 	description: 'uses a custom path resolver (asynchronous)',
 	options: {
+		plugins: [{
 			resolveId: function ( importee, importer ) {
 				var Promise = require( 'sander' ).Promise;
 				var resolved;
@@ -18,6 +19,7 @@ module.exports = {
 
 				return Promise.resolve( resolved );
 			}
+		}]
 	},
 	exports: function ( exports ) {
 		assert.strictEqual( exports.path, require( 'path' ) );

test/function/custom-path-resolver-on-entry/_config.js

@@ -10,6 +10,7 @@ module.exports = {
 	description: 'applies custom resolver to entry point',
 	//solo: true,
 	options: {
+		plugins: [{
 			resolveId: function ( importee, importer ) {
 				if ( importer === undefined ) {
 					return '@' + path.relative( __dirname, importee );
@@ -26,6 +27,7 @@ module.exports = {
 
 				return fs.readFileSync( moduleId, 'utf-8' );
 			}
+		}]
 	},
 	exports: function ( exports ) {
 		assert.equal( exports, 42 );

test/function/custom-path-resolver-plural-b/_config.js

@@ -3,18 +3,22 @@ var assert = require( 'assert' );
 module.exports = {
 	description: 'resolver error is not caught',
 	options: {
-		resolveId: [
+		plugins: [
-			function () {
+			{
+				resolveId: function () {
 					throw new Error( 'nope' );
 				},
-			function ( importee, importer ) {
-				return 'main';
-			}
-		],
 				load: function ( id ) {
 					if ( id === 'main' ) return 'assert.ok( false );'
 				}
 			},
+			{
+				resolveId: function ( importee, importer ) {
+					return 'main';
+				}
+			}
+		]
+	},
 	error: function ( err ) {
 		assert.equal( err.message, 'nope' );
 	}

test/function/custom-path-resolver-plural/_config.js

@@ -4,19 +4,23 @@ var assert = require( 'assert' );
 module.exports = {
 	description: 'uses custom path resolvers (plural)',
 	options: {
-		resolveId: [
+		plugins: [
-			function ( importee ) {
+			{
+				resolveId: function ( importee ) {
 					if ( importee[0] === '@' )
 						return path.resolve( __dirname, 'globals-' + importee.slice( 1 ).toLowerCase() + '.js' );
 				},
-			function ( importee ) {
-				if ( importee[0] === '!' ) return '<empty>';
-			}
-		],
 				load: function ( id ) {
 					if ( id === '<empty>' ) return '';
 				}
 			},
+			{
+				resolveId: function ( importee ) {
+					if ( importee[0] === '!' ) return '<empty>';
+				}
+			}
+		]
+	},
 	exports: function ( exports ) {
 		assert.strictEqual( exports.res, 0 );
 	}

test/function/custom-path-resolver-sync/_config.js

@@ -4,12 +4,14 @@ var assert = require( 'assert' );
 module.exports = {
 	description: 'uses a custom path resolver (synchronous)',
 	options: {
+		plugins: [{
 			resolveId: function ( importee, importer ) {
 				if ( path.normalize(importee) === path.resolve( __dirname, 'main.js' ) ) return importee;
 				if ( importee === 'foo' ) return path.resolve( __dirname, 'bar.js' );
 
 				return false;
 			}
+		}]
 	},
 	exports: function ( exports ) {
 		assert.strictEqual( exports.path, require( 'path' ) );

test/function/does-not-hang-on-missing-module/_config.js

@@ -2,7 +2,12 @@ var assert = require( 'assert' );
 
 module.exports = {
 	description: 'does not hang on missing module (#53)',
-	error: function ( error ) {
+	options: {
-		assert.ok( /Could not find package unlessYouCreatedThisFileForSomeReason/.test( error.message ) );
+		onwarn: function ( msg ) {
+			assert.equal( "Treating 'unlessYouCreatedThisFileForSomeReason' as external dependency", msg );
+		}
+	},
+	runtimeError: function ( error ) {
+		assert.equal( "Cannot find module 'unlessYouCreatedThisFileForSomeReason'", error.message );
 	}
 };

test/function/import-from-external-subdirectory/_config.js

@@ -1,4 +0,0 @@
-module.exports = {
-	description: 'default resolver imports from a subdirectory of an external module',
-	babel: true
-};

test/function/import-from-external-subdirectory/main.js

@@ -1,5 +0,0 @@
-// this test is brittle, it relies on this dependency continuing
-// to be structured in a certain way
-import btoa from 'magic-string/src/utils/btoa';
-
-assert.equal( btoa( 'it works' ), new Buffer( 'it works' ).toString( 'base64' ) );

test/function/uses-supplied-ast/_config.js

@@ -19,6 +19,7 @@ var modules = {
 module.exports = {
 	description: 'uses supplied AST',
 	options: {
+		plugins: [{
 			resolveId: function ( importee, importer ) {
 				if ( !importer ) return 'main';
 				return importee;
@@ -30,5 +31,6 @@ module.exports = {
 
 				return modules[ id ];
 			}
+		}]
 	}
 };