X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=Gruntfile.js;h=e4322797bb6d23af253c3823190a22c61820f4bf;hb=a8c16f64778c09149c6668ab72f6d0b2588517e0;hp=9cf89d08271ab41df77d4167247da34bd7493286;hpb=57f5e6bf200bc1bf7df108cbfc2bb1846aea4242;p=lhc%2Fweb%2Fwiklou.git

diff --git a/Gruntfile.js b/Gruntfile.js
index 9cf89d0827..e4322797bb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,7 +8,10 @@ module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-karma' );
 
 	var wgServer = process.env.MW_SERVER,
-		wgScriptPath = process.env.MW_SCRIPT_PATH;
+		wgScriptPath = process.env.MW_SCRIPT_PATH,
+		karmaProxy = {};
+
+	karmaProxy[wgScriptPath] = wgServer + wgScriptPath;
 
 	grunt.initConfig( {
 		pkg: grunt.file.readJSON( 'package.json' ),
@@ -18,7 +21,7 @@ module.exports = function ( grunt ) {
 			},
 			all: [
 				'*.js',
-				'{includes,languages,resources,skins,tests}/**/*.js'
+				'{includes,languages,resources,tests}/**/*.js'
 			]
 		},
 		jscs: {
@@ -62,27 +65,7 @@ module.exports = function ( grunt ) {
 		},
 		karma: {
 			options: {
-				proxies: ( function () {
-					var obj = {};
-					// Set up a proxy for requests to relative urls inside wgScriptPath. Uses a
-					// property accessor instead of plain obj[wgScriptPath] assignment as throw if
-					// unset. Running grunt normally (e.g. npm test), should not fail over this.
-					// This ensures 'npm test' works out of the box, statically, on a git clone
-					// without MediaWiki fully installed or some environment variables set.
-					Object.defineProperty( obj, wgScriptPath, {
-						enumerable: true,
-						get: function () {
-							if ( !wgServer ) {
-								grunt.fail.fatal( 'MW_SERVER is not set' );
-							}
-							if ( !wgScriptPath ) {
-								grunt.fail.fatal( 'MW_SCRIPT_PATH is not set' );
-							}
-							return wgServer + wgScriptPath;
-						}
-					} );
-					return obj;
-				}() ),
+				proxies: karmaProxy,
 				files: [ {
 					pattern: wgServer + wgScriptPath + '/index.php?title=Special:JavaScriptTest/qunit/export',
 					watched: false,