Leave path config alone unless it is a known sibling configuration

persvr · Oct 14, 2014 · f3640c3 · f3640c3
1 parent 9a58030
commit f3640c3
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/test/intern.js b/test/intern.js
@@ -40,21 +40,16 @@ define({
 
 	// Configuration options for the module loader; any AMD configuration options supported by the specified AMD loader
 	// can be used here
-	loader: {
-		baseUrl: typeof process === 'undefined' ?
-				// if we are using the full path to rql, we assume we are running
-				// in a sibling path configuration
-				location.search.indexOf('config=rql') > -1 ? '../..' : '..' :
-			'./node_modules',
-		// Packages that should be registered with the loader in each testing environment
-		packages: [
-			{ name: 'rql', location: typeof process === 'undefined' &&
-					location.search.indexOf('config=rql') > -1 ? 'rql' : '..'}
-		]
-	},
+	loader: (typeof process === 'undefined' && location.search.indexOf('config=rql') > -1) ?
+		{
+			// if we are using the full path to rql, we assume we are running
+			// in a sibling path configuration
+			baseUrl: '../..'
+		} : {},
 
 	// Non-functional test suite(s) to run in each browser
-	suites: [ 'rql/test/all' ],
+	suites: [ (typeof process === 'undefined' && location.search.indexOf('config=rql') > -1) ?
+		'rql/test/all' : 'test/all' ],
 
 	// A regular expression matching URLs to files that should not be included in code coverage analysis
 	excludeInstrumentation: /^(?:test|node_modules)\//