From 39f32f9869d624ad0218c05c0f83a41a810cb6ce Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Thu, 5 May 2016 15:49:24 +0500
Subject: [PATCH] Simplified normalizePathsForCoverage.

---
 common/static/common/js/karma.common.conf.js | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/common/static/common/js/karma.common.conf.js b/common/static/common/js/karma.common.conf.js
index 16e67006de..649c15195c 100644
--- a/common/static/common/js/karma.common.conf.js
+++ b/common/static/common/js/karma.common.conf.js
@@ -124,24 +124,24 @@ function junitSettings(config) {
     };
 }
 
-var normalizePathsForCoverage = function(files, normalize_func) {
-    var filesForCoverage = {};
+var defaultNormalizeFunc = function (appRoot, pattern) {
+    if (pattern.match(/^common\/js/)) {
+        pattern = path.join(appRoot, '/common/static/' + pattern);
+    } else if (pattern.match(/^xmodule_js\/common_static/)) {
+        pattern = path.join(appRoot, '/common/static/' +
+          pattern.replace(/^xmodule_js\/common_static\//, ''));
+    }
+    return pattern;
+};
+
+var normalizePathsForCoverage = function(files, normalizeFunc) {
+    var normalizeFn = normalizeFunc || defaultNormalizeFunc,
+        filesForCoverage = {};
 
     files.forEach(function (file) {
-        if (_.isObject(file) && file.ignoreCoverage) { return; }
-
-        var pattern = _.isObject(file) ? file.pattern : file;
-        if (normalize_func) {
-            pattern = normalize_func(appRoot, pattern);
-        } else {
-            if (pattern.match(/^common\/js/)) {
-                pattern = path.join(appRoot, '/common/static/' + pattern);
-            } else if (pattern.match(/^xmodule_js\/common_static/)) {
-                pattern = path.join(appRoot, '/common/static/' +
-                  pattern.replace(/^xmodule_js\/common_static\//, ''));
-            }
+        if (!file.ignoreCoverage) {
+          filesForCoverage[normalizeFn(appRoot, file.pattern)] = ['coverage'];
         }
-        filesForCoverage[pattern] = ['coverage'];
     });
 
     return filesForCoverage;