From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 30 Jan 2015 05:29:15 +0000 (-0800)
Subject: Gruntfile: Clean up Karma config
X-Git-Tag: 1.31.0-rc.0~12529^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=8d92aaf83e3caea3e6b2488e44e8d6c797ed30c4;p=lhc%2Fweb%2Fwiklou.git

Gruntfile: Clean up Karma config

Change-Id: I8197c2b0169983c32a44397faec95ad7eb47ab86
---

diff --git a/Gruntfile.js b/Gruntfile.js
index 9cf89d0827..4481e392a1 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' ),
@@ -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,