Browser unit tests by using custom intern loader

tests/intern.ts

@@ -15,22 +15,11 @@ export const capabilities = {
 export const maxConcurrency = 5;
 
 export const browser = {
-	require: [
-		'./node_modules/@dojo/loader/loader.js',
-		'./_build/src/util/amd.js',
-		'./_build/tests/loader.js',
-		'./_build/src/main.js'
-	]
-};
-
-export const node = {
-	require: [
-		'./_build/src/main.js'
-	]
+	loader: './_build/tests/loader.js'
 };
 
 // Non-functional test suite(s) to run in each browser
-export const suites = ['_build/tests/unit/all.js'];
+export const suites = ['_build/src/main.js', '_build/tests/unit/all.js'];
 
 // Functional test suite(s) to run in each browser once non-functional tests are completed
 export const functionalSuites = '_build/tests/functional/all';

tests/loader.ts

@@ -1,7 +1,16 @@
-(<any> require).config(shimAmdDependencies({
-	packages: [
-		{ name: 'src', location: '_build/src' },
-		{ name: 'tests', location: '_build/tests' },
-		{ name: 'dojo', location: 'node_modules/intern/node_modules/dojo' }
-	]
-}));
+intern.registerLoader((options) => {
+	return intern.loadScript('node_modules/@dojo/loader/loader.js')
+		.then(() => intern.loadScript('./_build/src/util/amd.js'))
+		.then(() => {
+			(<any> require).config(shimAmdDependencies({
+				baseUrl: options.baseUrl || intern.config.basePath,
+				packages: []
+			}));
+
+			return (modules: string[]) => {
+				return new Promise<void>((resolve, reject) => {
+					(<any> require)(modules, () => resolve());
+				});
+			};
+		});
+});