From bb7b29b30885722d479d9ed34c3c527f1d978eee Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Wed, 4 May 2016 20:05:10 +0500
Subject: [PATCH 01/11] Deleted js-test-tool config files.

---
 cms/static/js_test.yml                    | 115 -------------------
 cms/static/js_test_squire.yml             | 103 -----------------
 common/lib/xmodule/xmodule/js/js_test.yml |  75 -------------
 common/static/js_test.yml                 |  88 ---------------
 common/static/js_test_requirejs.yml       |  79 -------------
 lms/static/js_test.yml                    | 130 ----------------------
 lms/static/js_test_coffee.yml             |  89 ---------------
 7 files changed, 679 deletions(-)
 delete mode 100644 cms/static/js_test.yml
 delete mode 100644 cms/static/js_test_squire.yml
 delete mode 100644 common/lib/xmodule/xmodule/js/js_test.yml
 delete mode 100644 common/static/js_test.yml
 delete mode 100644 common/static/js_test_requirejs.yml
 delete mode 100644 lms/static/js_test.yml
 delete mode 100644 lms/static/js_test_coffee.yml

diff --git a/cms/static/js_test.yml b/cms/static/js_test.yml
deleted file mode 100644
index 3953a9cec5..0000000000
--- a/cms/static/js_test.yml
+++ /dev/null
@@ -1,115 +0,0 @@
----
-# JavaScript test suite description
-#
-#
-# To run all the tests and print results to the console:
-#
-#   js-test-tool run TEST_SUITE --use-firefox
-#
-# where `TEST_SUITE` is this file.
-#
-#
-# To run the tests in your default browser ("dev mode"):
-#
-#   js-test-tool dev TEST_SUITE
-#
-
-test_suite_name: cms
-
-test_runner: jasmine_requirejs
-
-# Path prepended to source files in the coverage report (optional)
-# For example, if the source path
-# is "src/source.js" (relative to this YAML file)
-# and the prepend path is "base/dir"
-# then the coverage report will show
-# "base/dir/src/source.js"
-prepend_path: cms/static
-
-# Paths to library JavaScript files (optional)
-lib_paths:
-    - xmodule_js/common_static/js/vendor/requirejs/require.js
-    - xmodule_js/common_static/coffee/src/ajax_prefix.js
-    - xmodule_js/common_static/js/src/utility.js
-    - xmodule_js/common_static/js/vendor/jquery.min.js
-    - xmodule_js/common_static/js/vendor/jquery-ui.min.js
-    - xmodule_js/common_static/js/vendor/jquery.cookie.js
-    - xmodule_js/common_static/js/vendor/jquery.simulate.js
-    - xmodule_js/common_static/common/js/vendor/underscore.js
-    - xmodule_js/common_static/common/js/vendor/underscore.string.js
-    - xmodule_js/common_static/common/js/vendor/backbone.js
-    - xmodule_js/common_static/js/vendor/backbone-associations-min.js
-    - xmodule_js/common_static/js/vendor/backbone.paginator.min.js
-    - xmodule_js/common_static/js/vendor/backbone-relational.min.js
-    - xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js
-    - xmodule_js/common_static/js/vendor/jquery.leanModal.js
-    - xmodule_js/common_static/js/vendor/jquery.ajaxQueue.js
-    - xmodule_js/common_static/js/vendor/jquery.form.js
-    - xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill.js
-    - xmodule_js/common_static/js/vendor/sinon-1.17.0.js
-    - xmodule_js/common_static/js/vendor/Squire.js
-    - xmodule_js/common_static/js/libs/jasmine-stealth.js
-    - xmodule_js/common_static/js/libs/jasmine-waituntil.js
-    - xmodule_js/common_static/js/vendor/jasmine-imagediff.js
-    - xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js
-    - xmodule_js/src/xmodule.js
-    - xmodule_js/common_static/js/test/i18n.js
-    - xmodule_js/common_static/js/vendor/draggabilly.js
-    - xmodule_js/common_static/js/vendor/date.js
-    - xmodule_js/common_static/js/vendor/domReady.js
-    - xmodule_js/common_static/js/vendor/URI.min.js
-    - xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min.js
-    - xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js
-    - xmodule_js/common_static/js/xblock/
-    - xmodule_js/common_static/coffee/src/xblock/
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-process.js
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-validate.js
-    - xmodule_js/common_static/js/vendor/mock-ajax.js
-    - xmodule_js/common_static/js/vendor/requirejs/text.js
-    - xmodule_js/common_static/edx-pattern-library/js/modernizr-custom.js
-    - xmodule_js/common_static/edx-pattern-library/js/afontgarde.js
-    - xmodule_js/common_static/edx-pattern-library/js/edx-icons.js
-
-# Paths to source JavaScript files
-src_paths:
-    - coffee/src
-    - js
-    - js/certificates
-    - js/factories
-    - common/js
-    - edx-pattern-library/js
-    - edx-ui-toolkit/js
-
-# Paths to spec (test) JavaScript files
-# We should define the custom path mapping in /coffee/spec/main.coffee as well e.g. certificates etc.
-spec_paths:
-    - coffee/spec/main.js
-    - coffee/spec
-    - js/spec
-    - js/certificates/spec
-
-# Paths to fixture files (optional)
-# The fixture path will be set automatically when using jasmine-jquery.
-# (https://github.com/velesin/jasmine-jquery)
-#
-# You can then access fixtures using paths relative to
-# the test suite description:
-#
-#   loadFixtures('path/to/fixture/fixture.html');
-#
-fixture_paths:
-    - coffee/fixtures
-    - templates
-    - common/templates
-
-requirejs:
-  paths:
-    main: coffee/spec/main
-
-# Because require.js is responsible for loading all dependencies, we exclude
-# all files from being included in <script> tags
-exclude_from_page:
-    - .*
diff --git a/cms/static/js_test_squire.yml b/cms/static/js_test_squire.yml
deleted file mode 100644
index 4c20a67d2e..0000000000
--- a/cms/static/js_test_squire.yml
+++ /dev/null
@@ -1,103 +0,0 @@
----
-# JavaScript test suite description
-#
-#
-# To run all the tests and print results to the console:
-#
-#   js-test-tool run TEST_SUITE --use-firefox
-#
-# where `TEST_SUITE` is this file.
-#
-#
-# To run the tests in your default browser ("dev mode"):
-#
-#   js-test-tool dev TEST_SUITE
-#
-
-test_suite_name: cms-squire
-
-test_runner: jasmine_requirejs
-
-# Path prepended to source files in the coverage report (optional)
-# For example, if the source path
-# is "src/source.js" (relative to this YAML file)
-# and the prepend path is "base/dir"
-# then the coverage report will show
-# "base/dir/src/source.js"
-prepend_path: cms/static
-
-# Paths to library JavaScript files (optional)
-lib_paths:
-    - xmodule_js/common_static/js/vendor/requirejs/require.js
-    - xmodule_js/common_static/coffee/src/ajax_prefix.js
-    - xmodule_js/common_static/js/src/utility.js
-    - xmodule_js/common_static/js/vendor/jquery.min.js
-    - xmodule_js/common_static/js/vendor/jquery-ui.min.js
-    - xmodule_js/common_static/js/vendor/jquery.cookie.js
-    - xmodule_js/common_static/common/js/vendor/underscore.js
-    - xmodule_js/common_static/common/js/vendor/underscore.string.js
-    - xmodule_js/common_static/common/js/vendor/backbone.js
-    - xmodule_js/common_static/js/vendor/backbone-associations-min.js
-    - xmodule_js/common_static/js/vendor/backbone.paginator.min.js
-    - xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js
-    - xmodule_js/common_static/js/vendor/jquery.leanModal.js
-    - xmodule_js/common_static/js/vendor/jquery.form.js
-    - xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill.js
-    - xmodule_js/common_static/js/vendor/sinon-1.17.0.js
-    - xmodule_js/common_static/js/vendor/Squire.js
-    - xmodule_js/common_static/js/vendor/jasmine-imagediff.js
-    - xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js
-    - xmodule_js/common_static/js/vendor/domReady.js
-    - xmodule_js/common_static/js/vendor/URI.min.js
-    - xmodule_js/src/xmodule.js
-    - xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js
-    - xmodule_js/common_static/js/test/i18n.js
-    - xmodule_js/common_static/js/xblock/
-    - xmodule_js/common_static/coffee/src/xblock/
-    - xmodule_js/common_static/js/vendor/URI.min.js
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-process.js
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-validate.js
-    - xmodule_js/common_static/js/vendor/requirejs/text.js
-
-# Paths to source JavaScript files
-src_paths:
-    - coffee/src
-    # We don't include all of js because the Javascript files in js/i18n cause issues with the Squire tests.
-    - js/collections
-    - js/models
-    - js/utils
-    - js/views
-    - common/js
-    - edx-pattern-library/js
-    - edx-ui-toolkit/js
-
-# Paths to spec (test) JavaScript files
-spec_paths:
-    - coffee/spec/main.js
-    - coffee/spec
-    - js/spec
-
-# Paths to fixture files (optional)
-# The fixture path will be set automatically when using jasmine-jquery.
-# (https://github.com/velesin/jasmine-jquery)
-#
-# You can then access fixtures using paths relative to
-# the test suite description:
-#
-#   loadFixtures('path/to/fixture/fixture.html');
-#
-fixture_paths:
-    - coffee/fixtures
-    - templates
-    - common/templates
-
-requirejs:
-  paths:
-    main: coffee/spec/main_squire
-
-# Because require.js is responsible for loading all dependencies, we exclude
-# all files from being included in <script> tags
-exclude_from_page:
-    - .*
diff --git a/common/lib/xmodule/xmodule/js/js_test.yml b/common/lib/xmodule/xmodule/js/js_test.yml
deleted file mode 100644
index d9e4e9ec56..0000000000
--- a/common/lib/xmodule/xmodule/js/js_test.yml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-# JavaScript test suite description
-#
-#
-# To run all the tests and print results to the console:
-#
-#   js-test-tool run TEST_SUITE --use-firefox
-#
-# where `TEST_SUITE` is this file.
-#
-#
-# To run the tests in your default browser ("dev mode"):
-#
-#   js-test-tool dev TEST_SUITE
-#
-
-test_suite_name: xmodule
-
-test_runner: jasmine
-
-# Path prepended to source files in the coverage report (optional)
-# For example, if the source path
-# is "src/source.js" (relative to this YAML file)
-# and the prepend path is "base/dir"
-# then the coverage report will show
-# "base/dir/src/source.js"
-prepend_path: common/lib/xmodule/xmodule/js
-
-# Paths to source JavaScript files
-src_paths:
-    - src/xmodule.js
-    - src
-
-# Paths to library JavaScript files (optional)
-lib_paths:
-    - common_static/js/test/i18n.js
-    - common_static/coffee/src/ajax_prefix.js
-    - common_static/js/src/logger.js
-    - common_static/js/vendor/jasmine-imagediff.js
-    - common_static/js/libs/jasmine-waituntil.js
-    - common_static/js/vendor/requirejs/require.js
-    - RequireJS-namespace-undefine.js
-    - common_static/js/vendor/jquery.min.js
-    - common_static/js/vendor/jquery-ui.min.js
-    - common_static/js/vendor/jquery.ui.draggable.js
-    - common_static/js/vendor/jquery.cookie.js
-    - common_static/js/vendor/json2.js
-    - common_static/common/js/vendor/underscore.js
-    - common_static/common/js/vendor/backbone.js
-    - common_static/js/vendor/jquery.leanModal.js
-    - common_static/js/vendor/CodeMirror/codemirror.js
-    - common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js
-    - common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min.js
-    - common_static/js/vendor/jquery.timeago.js
-    - common_static/js/vendor/sinon-1.17.0.js
-    - common_static/js/vendor/analytics.js
-    - common_static/js/test/add_ajax_prefix.js
-    - common_static/js/src/utility.js
-    - public/js/split_test_staff.js
-    - common_static/js/src/accessibility_tools.js
-    - common_static/js/vendor/moment.min.js
-    - common_static/js/vendor/draggabilly.js
-    - common_static/edx-pattern-library/js/modernizr-custom.js
-    - common_static/edx-pattern-library/js/afontgarde.js
-    - common_static/edx-pattern-library/js/edx-icons.js
-    - spec/main_requirejs.js
-
-# Paths to spec (test) JavaScript files
-spec_paths:
-    - spec/helper.js
-    - spec
-
-# Paths to fixture files (optional)
-fixture_paths:
-    - fixtures
diff --git a/common/static/js_test.yml b/common/static/js_test.yml
deleted file mode 100644
index cc7a0629af..0000000000
--- a/common/static/js_test.yml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-# JavaScript test suite description
-#
-#
-# To run all the tests and print results to the console:
-#
-#   js-test-tool run TEST_SUITE --use-firefox
-#
-# where `TEST_SUITE` is this file.
-#
-#
-# To run the tests in your default browser ("dev mode"):
-#
-#   js-test-tool dev TEST_SUITE
-#
-
-test_suite_name: common
-
-test_runner: jasmine
-
-# Path prepended to source files in the coverage report (optional)
-# For example, if the source path
-# is "src/source.js" (relative to this YAML file)
-# and the prepend path is "base/dir"
-# then the coverage report will show
-# "base/dir/src/source.js"
-prepend_path: common/static
-
-# Paths to library JavaScript files (optional)
-lib_paths:
-    - js/vendor/jquery.min.js
-    - js/vendor/jasmine-imagediff.js
-    - js/libs/jasmine-waituntil.js
-    - js/vendor/jquery.truncate.js
-    - js/vendor/mustache.js
-    - common/js/vendor/underscore.js
-    - common/js/vendor/underscore.string.js
-    - common/js/vendor/backbone.js
-    - js/vendor/jquery.timeago.js
-    - js/vendor/URI.min.js
-    - js/vendor/draggabilly.js
-    - coffee/src/ajax_prefix.js
-    - js/test/add_ajax_prefix.js
-    - js/test/i18n.js
-    - coffee/src/jquery.immediateDescendents.js
-    - edx-pattern-library/js/modernizr-custom.js
-    - edx-pattern-library/js/afontgarde.js
-    - edx-pattern-library/js/edx-icons.js
-
-# Paths to source JavaScript files
-src_paths:
-    - js/xblock
-    - coffee/src
-    - js/src
-    - js/capa/src
-
-# Paths to spec (test) JavaScript files
-spec_paths:
-    - coffee/spec
-    - js/spec
-    - js/capa/spec
-
-# Regular expressions used to exclude *.js files from
-# appearing in the test runner page.
-# Files are included by default, which means that they
-# are loaded using a <script> tag in the test runner page.
-# When loading many files, this can be slow, so
-# exclude any files you don't need.
-#exclude_from_page:
-#    - path/to/lib/include/exception_*.js
-
-# Regular expression used to guarantee that a *.js file
-# is included in the test runner page.
-# If a file name matches both `exclude_from_page` and
-# `include_in_page`, the file WILL be included.
-# You can use this to exclude all files in a directory,
-# but make an exception for particular files.
-#include_in_page:
-#    - path/to/lib/exclude/exception_*.js
-
-# Paths to fixture files (optional)
-# You can access these within JavaScript code
-# at the URL: document.location.href + "/include/"
-# plus the path to the file (relative to this YAML file)
-fixture_paths:
-    - js/fixtures
-    - js/capa/fixtures
-    - common/templates
diff --git a/common/static/js_test_requirejs.yml b/common/static/js_test_requirejs.yml
deleted file mode 100644
index b687c1bec7..0000000000
--- a/common/static/js_test_requirejs.yml
+++ /dev/null
@@ -1,79 +0,0 @@
----
-# Common JavaScript tests, using RequireJS.
-#
-#
-# To run all the tests and print results to the console:
-#
-#   js-test-tool run TEST_SUITE --use-firefox
-#
-# where `TEST_SUITE` is this file.
-#
-#
-# To run the tests in your default browser ("dev mode"):
-#
-#   js-test-tool dev TEST_SUITE
-#
-
-test_suite_name: common-requirejs
-
-test_runner: jasmine_requirejs
-
-# Path prepended to source files in the coverage report (optional)
-# For example, if the source path
-# is "src/source.js" (relative to this YAML file)
-# and the prepend path is "base/dir"
-# then the coverage report will show
-# "base/dir/src/source.js"
-prepend_path: common/static
-
-# Paths to library JavaScript files (optional)
-lib_paths:
-    - js/vendor/jquery.min.js
-    - js/vendor/jasmine-imagediff.js
-    - js/libs/jasmine-stealth.js
-    - js/libs/jasmine-waituntil.js
-    - js/vendor/jquery.simulate.js
-    - js/vendor/jquery.truncate.js
-    - common/js/vendor/underscore.js
-    - common/js/vendor/underscore.string.js
-    - common/js/vendor/backbone.js
-    - js/vendor/backbone.paginator.min.js
-    - js/vendor/jquery.timeago.js
-    - js/vendor/URI.min.js
-    - coffee/src/ajax_prefix.js
-    - js/test/add_ajax_prefix.js
-    - js/test/i18n.js
-    - coffee/src/jquery.immediateDescendents.js
-    - js/vendor/requirejs/text.js
-    - js/vendor/sinon-1.17.0.js
-
-# Paths to source JavaScript files
-src_paths:
-    - common/js
-    - edx-pattern-library/js
-    - edx-ui-toolkit/js
-
-# Paths to spec (test) JavaScript files
-spec_paths:
-    - common/js/spec
-
-# Paths to fixture files (optional)
-# The fixture path will be set automatically when using jasmine-jquery.
-# (https://github.com/velesin/jasmine-jquery)
-#
-# You can then access fixtures using paths relative to
-# the test suite description:
-#
-#   loadFixtures('path/to/fixture/fixture.html');
-#
-fixture_paths:
-    - common/templates
-
-requirejs:
-  paths:
-    main: common/js/spec/main_requirejs
-
-# Because require.js is responsible for loading all dependencies, we exclude
-# all files from being included in <script> tags
-exclude_from_page:
-    - .*
diff --git a/lms/static/js_test.yml b/lms/static/js_test.yml
deleted file mode 100644
index 1385b225da..0000000000
--- a/lms/static/js_test.yml
+++ /dev/null
@@ -1,130 +0,0 @@
----
-# LMS JavaScript tests (using RequireJS).
-#
-#
-# To run all the tests and print results to the console:
-#
-#   js-test-tool run TEST_SUITE --use-firefox
-#
-# where `TEST_SUITE` is this file.
-#
-#
-# To run the tests in your default browser ("dev mode"):
-#
-#   js-test-tool dev TEST_SUITE
-#
-
-test_suite_name: lms
-
-test_runner: jasmine_requirejs
-
-# Path prepended to source files in the coverage report (optional)
-# For example, if the source path
-# is "src/source.js" (relative to this YAML file)
-# and the prepend path is "base/dir"
-# then the coverage report will show
-# "base/dir/src/source.js"
-prepend_path: lms/static
-
-# Paths to library JavaScript files (optional)
-lib_paths:
-    - xmodule_js/common_static/js/test/i18n.js
-    - xmodule_js/common_static/coffee/src/ajax_prefix.js
-    - xmodule_js/common_static/js/src/logger.js
-    - xmodule_js/common_static/js/vendor/jasmine-imagediff.js
-    - xmodule_js/common_static/js/vendor/requirejs/require.js
-    - js/RequireJS-namespace-undefine.js
-    - xmodule_js/common_static/js/vendor/requirejs/text.js
-    - xmodule_js/common_static/js/vendor/jquery.min.js
-    - xmodule_js/common_static/js/vendor/jquery-ui.min.js
-    - xmodule_js/common_static/js/vendor/jquery.simulate.js
-    - xmodule_js/common_static/js/vendor/jquery.cookie.js
-    - xmodule_js/common_static/js/vendor/jquery.timeago.js
-    - xmodule_js/common_static/js/vendor/flot/jquery.flot.js
-    - xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js
-    - xmodule_js/common_static/js/vendor/URI.min.js
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js
-    - xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js
-    - xmodule_js/common_static/js/vendor/url.min.js
-    - xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js
-    - xmodule_js/common_static/js/xblock
-    - xmodule_js/common_static/coffee/src/xblock
-    - coffee/src/instructor_dashboard
-    - xmodule_js/common_static/js/vendor/sinon-1.17.0.js
-    - xmodule_js/src/capa/
-    - xmodule_js/src/video/
-    - xmodule_js/src/xmodule.js
-    - xmodule_js/common_static/js/src/
-    - xmodule_js/common_static/common/js/vendor/underscore.js
-    - xmodule_js/common_static/common/js/vendor/underscore.string.js
-    - xmodule_js/common_static/common/js/vendor/backbone.js
-    - xmodule_js/common_static/js/vendor/backbone.paginator.min.js
-    - xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js
-    - xmodule_js/common_static/js/test/i18n.js
-    - xmodule_js/common_static/js/vendor/date.js
-    - xmodule_js/common_static/js/vendor/moment.min.js
-    - xmodule_js/common_static/js/vendor/moment-with-locales.min.js
-    - xmodule_js/common_static/common/js/utils/edx.utils.validate.js
-    - xmodule_js/common_static/js/vendor/slick.core.js
-    - xmodule_js/common_static/js/vendor/slick.grid.js
-    - xmodule_js/common_static/js/vendor/jquery.event.drag-2.2.js
-    - xmodule_js/common_static/common/js/vendor/picturefill.js
-
-# Paths to source JavaScript files
-src_paths:
-    - js
-    - coffee/src
-    - common/js
-    - edx-pattern-library/js
-    - edx-ui-toolkit/js
-    - support/js
-    - teams/js
-    - xmodule_js/common_static/coffee
-
-# Paths to spec (test) JavaScript files
-spec_paths:
-    - js/spec
-    - teams/js/spec
-    - support/js/spec
-
-# Paths to fixture files (optional)
-# The fixture path will be set automatically when using jasmine-jquery.
-# (https://github.com/velesin/jasmine-jquery)
-#
-# You can then access fixtures using paths relative to
-# the test suite description:
-#
-#   loadFixtures('path/to/fixture/fixture.html');
-#
-fixture_paths:
-    - js/fixtures
-    - templates/instructor/instructor_dashboard_2
-    - templates/dashboard
-    - templates/edxnotes
-    - templates/fields
-    - templates/student_account
-    - templates/student_profile
-    - templates/verify_student
-    - templates/file-upload.underscore
-    - templates/components/header
-    - templates/components/card
-    - templates/financial-assistance/
-    - js/fixtures/edxnotes
-    - js/fixtures/search
-    - templates/search
-    - templates/discovery
-    - common/templates
-    - teams/templates
-    - support/templates
-    - js/fixtures/bookmarks
-    - templates/bookmarks
-    - templates/learner_dashboard
-
-requirejs:
-  paths:
-    main: js/spec/main
-
-# Because require.js is responsible for loading all dependencies, we exclude
-# all files from being included in <script> tags
-exclude_from_page:
-    - .*
diff --git a/lms/static/js_test_coffee.yml b/lms/static/js_test_coffee.yml
deleted file mode 100644
index 82e1f58195..0000000000
--- a/lms/static/js_test_coffee.yml
+++ /dev/null
@@ -1,89 +0,0 @@
----
-# LMS CoffeeScript tests that are not yet using RequireJS.
-#
-#
-# To run all the tests and print results to the console:
-#
-#   js-test-tool run TEST_SUITE --use-firefox
-#
-# where `TEST_SUITE` is this file.
-#
-#
-# To run the tests in your default browser ("dev mode"):
-#
-#   js-test-tool dev TEST_SUITE
-#
-
-test_suite_name: lms-coffee
-
-test_runner: jasmine
-
-# Path prepended to source files in the coverage report (optional)
-# For example, if the source path
-# is "src/source.js" (relative to this YAML file)
-# and the prepend path is "base/dir"
-# then the coverage report will show
-# "base/dir/src/source.js"
-prepend_path: lms/static
-
-# Paths to library JavaScript files (optional)
-lib_paths:
-    - xmodule_js/common_static/js/test/i18n.js
-    - xmodule_js/common_static/coffee/src/ajax_prefix.js
-    - xmodule_js/common_static/js/src/logger.js
-    - xmodule_js/common_static/js/vendor/underscore-min.js
-    - xmodule_js/common_static/js/vendor/jasmine-imagediff.js
-    - xmodule_js/common_static/js/vendor/requirejs/require.js
-    - js/RequireJS-namespace-undefine.js
-    - xmodule_js/common_static/js/vendor/jquery-ui.min.js
-    - xmodule_js/common_static/js/vendor/jquery.cookie.js
-    - xmodule_js/common_static/js/vendor/flot/jquery.flot.js
-    - xmodule_js/common_static/js/vendor/moment.min.js
-    - xmodule_js/common_static/js/vendor/moment-with-locales.min.js
-    - xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js
-    - xmodule_js/common_static/js/vendor/URI.min.js
-    - xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js
-    - xmodule_js/common_static/js/xblock
-    - xmodule_js/common_static/coffee/src/xblock
-    - moment_requirejs.js
-    - xmodule_js/src/capa/
-    - xmodule_js/src/video/
-    - xmodule_js/src/xmodule.js
-
-# Paths to source JavaScript files
-src_paths:
-    - coffee/src
-
-# Paths to spec (test) JavaScript files
-spec_paths:
-    - coffee/spec
-
-# Paths to fixture files (optional)
-# The fixture path will be set automatically when using jasmine-jquery.
-# (https://github.com/velesin/jasmine-jquery)
-#
-# You can then access fixtures using paths relative to
-# the test suite description:
-#
-#   loadFixtures('path/to/fixture/fixture.html');
-#
-fixture_paths:
-    - coffee/fixtures
-
-# Regular expressions used to exclude *.js files from
-# appearing in the test runner page.
-# Files are included by default, which means that they
-# are loaded using a <script> tag in the test runner page.
-# When loading many files, this can be slow, so
-# exclude any files you don't need.
-#exclude_from_page:
-#    - coffee/spec/helper.js
-
-# Regular expression used to guarantee that a *.js file
-# is included in the test runner page.
-# If a file name matches both `exclude_from_page` and
-# `include_in_page`, the file WILL be included.
-# You can use this to exclude all files in a directory,
-# but make an exception for particular files.
-#include_in_page:
-#    - path/to/lib/include/*

From ecf233c1b4add392d52cd2864e05cd14bbf456ea Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Tue, 3 May 2016 16:54:01 +0500
Subject: [PATCH 02/11] Keep karma config file docs only in
 karma.common.conf.js. Duplicate stuff tends to get out of sync.

---
 cms/static/karma_cms.conf.js                  | 22 ++---------------
 cms/static/karma_cms_squire.conf.js           | 22 ++---------------
 .../xmodule/xmodule/js/karma_xmodule.conf.js  | 22 ++---------------
 common/static/common/js/karma.common.conf.js  | 24 ++++++++++++++++++-
 common/static/karma_common.conf.js            | 22 ++---------------
 common/static/karma_common_requirejs.conf.js  | 22 ++---------------
 lms/static/karma_lms.conf.js                  | 22 ++---------------
 lms/static/karma_lms_coffee.conf.js           | 22 ++---------------
 8 files changed, 37 insertions(+), 141 deletions(-)

diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js
index a33692da00..956c7c65b0 100644
--- a/cms/static/karma_cms.conf.js
+++ b/cms/static/karma_cms.conf.js
@@ -1,23 +1,5 @@
-// Common JavaScript tests, using RequireJS.
-//
-// To run all the tests and print results to the console:
-//
-//   karma start cms/static/karma_cms.conf.js
-//
-//
-// To run the tests for debugging: Debugging can be done in any browser
-// but Chrome's developer console debugging experience is best.
-//
-//   karma start cms/static/karma_cms.conf.js --browsers=BROWSER --single-run=false
-//
-//
-// To run the tests with coverage and junit reports:
-//
-//   karma start cms/static/karma_cms.conf.js --browsers=BROWSER --coverage
-// --junitreportpath=<xunit_report_path> --coveragereportpath=<report_path>
-//
-// where `BROWSER` could be Chrome or Firefox.
-//
+// Karma config for cms suite.
+// Docs in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index bf6756dd57..fbd4c04986 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -1,23 +1,5 @@
-// Common JavaScript tests, using RequireJS.
-//
-// To run all the tests and print results to the console:
-//
-//   karma start cms/static/karma_cms_squire.conf.js
-//
-//
-// To run the tests for debugging: Debugging can be done in any browser
-// but Chrome's developer console debugging experience is best.
-//
-//   karma start cms/static/karma_cms_squire.conf.js --browsers=BROWSER --single-run=false
-//
-//
-// To run the tests with coverage and junit reports:
-//
-//   karma start cms/static/karma_cms_squire.conf.js --browsers=BROWSER --coverage
-// --junitreportpath=<xunit_report_path> --coveragereportpath=<report_path>
-//
-// where `BROWSER` could be Chrome or Firefox.
-//
+// Karma config for cms-squire suite.
+// Docs in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
index c0067fc257..b3ee098cdc 100644
--- a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
+++ b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
@@ -1,23 +1,5 @@
-// Xmodule Tests
-//
-// To run all the tests and print results to the console:
-//
-//   karma start common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
-//
-//
-// To run the tests for debugging: Debugging can be done in any browser
-// Chrome's developer console debugging experience is the best though
-//
-//   karma start common/lib/xmodule/xmodule/js/karma-xmodule.conf.js --browsers=BROWSER --single-run=false
-//
-//
-// To run the tests with coverage and junit reports:
-//
-//   karma start common/lib/xmodule/xmodule/js/karma-xmodule.conf.js
-//  --browsers=BROWSER --coverage --junitreportpath=<xunit_report_path> --coveragereportpath=<report_path>
-//
-// where `BROWSER` could be Chrome or Firefox.
-//
+// Karma config for xmodule suite.
+// Docs in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
diff --git a/common/static/common/js/karma.common.conf.js b/common/static/common/js/karma.common.conf.js
index 709c701187..7d678adae4 100644
--- a/common/static/common/js/karma.common.conf.js
+++ b/common/static/common/js/karma.common.conf.js
@@ -1,4 +1,26 @@
-// Common configuration for Karma
+// Common settings and helpers for setting up Karma config.
+//
+// To run all the tests in a suite and print results to the console:
+//
+//   karma start <karma_config_for_suite_path>
+//   E.g. karma start lms/static/karma_lms.conf.js
+//
+//
+// To run the tests for debugging: Debugging can be done in any browser
+// but Chrome's developer console debugging experience is best.
+//
+//   karma start <karma_config_for_suite_path> --browsers=BROWSER --single-run=false
+//
+//
+// To run the tests with coverage and junit reports:
+//
+//   karma start <karma_config_for_suite_path> --browsers=BROWSER
+// --coverage --junitreportpath=<xunit_report_path> --coveragereportpath=<report_path>
+//
+// where `BROWSER` could be Chrome or Firefox.
+//
+
+
 /* jshint node: true */
 /*jshint -W079 */
 'use strict';
diff --git a/common/static/karma_common.conf.js b/common/static/karma_common.conf.js
index e0fda8d515..d9864bdc58 100644
--- a/common/static/karma_common.conf.js
+++ b/common/static/karma_common.conf.js
@@ -1,23 +1,5 @@
-// Common JavaScript tests
-//
-// To run all the tests and print results to the console:
-//
-//   karma start common/static/karma_common.conf.js
-//
-//
-// To run the tests for debugging: Debugging can be done in any browser
-// but Chrome's developer console debugging experience is best.
-//
-//   karma start common/static/karma_common.conf.js --browsers=BROWSER --single-run=false
-//
-//
-// To run the tests with coverage and junit reports:
-//
-//   karma start common/static/karma_common.conf.js --browsers=BROWSER --coverage
-// --junitreportpath=<xunit_report_path> --coveragereportpath=<report_path>
-//
-// where `BROWSER` could be Chrome or Firefox.
-//
+// Karma config for common suite.
+// Docs in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
diff --git a/common/static/karma_common_requirejs.conf.js b/common/static/karma_common_requirejs.conf.js
index 7590ff4694..b06bb38837 100644
--- a/common/static/karma_common_requirejs.conf.js
+++ b/common/static/karma_common_requirejs.conf.js
@@ -1,23 +1,5 @@
-// Common JavaScript tests, using RequireJS.
-//
-// To run all the tests and print results to the console:
-//
-//   karma start common/static/karma_common_requirejs.conf.js
-//
-//
-// To run the tests for debugging: Debugging can be done in any browser
-// but Chrome's developer console debugging experience is best.
-//
-//   karma start karma_common_requirejs.conf.js --browsers=BROWSER --single-run=false
-//
-//
-// To run the tests with coverage and junit reports:
-//
-//   karma start karma_common_requirejs.conf.js --browsers=BROWSER --coverage
-// --junitreportpath=<xunit_report_path> --coveragereportpath=<report_path>
-//
-// where `BROWSER` could be Chrome or Firefox.
-//
+// Karma config for common-requirejs suite.
+// Docs in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js
index af8bcb4eba..b49932ec74 100644
--- a/lms/static/karma_lms.conf.js
+++ b/lms/static/karma_lms.conf.js
@@ -1,23 +1,5 @@
-// LMS JavaScript tests, using RequireJS.
-//
-// To run all the tests and print results to the console:
-//
-//   karma start lms/static/karma_lms.conf.js
-//
-//
-// To run the tests for debugging: Debugging can be done in any browser but
-// Chrome's developer console debugging experience is best.
-//
-//   karma start lms/static/karma_lms.conf.js --browsers=BROWSER --single-run=false
-//
-//
-// To run the tests with coverage and junit reports:
-//
-//   karma start lms/static/karma_lms.conf.js --browsers=BROWSER
-//   --coverage --junitreportpath=<xunit_report_path> --coveragereportpath=<report_path>
-//
-// where `BROWSER` could be Chrome or Firefox.
-//
+// Karma config for lms suite.
+// Docs in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
diff --git a/lms/static/karma_lms_coffee.conf.js b/lms/static/karma_lms_coffee.conf.js
index 1f4f0d9ae2..d15d212497 100644
--- a/lms/static/karma_lms_coffee.conf.js
+++ b/lms/static/karma_lms_coffee.conf.js
@@ -1,23 +1,5 @@
-// LMS Coffee Script Tests.
-//
-// To run all the tests and print results to the console:
-//
-//   karma start lms/static/karma_lms_coffee.conf.js
-//
-//
-// To run the tests for debugging: Debugging can be done in any browser
-// but Chrome's developer console debugging experience is best.
-//
-//   karma start lms/static/karma_lms_coffee.conf.js --browsers=BROWSER --single-run=false
-//
-//
-// To run the tests with coverage and junit reports:
-//
-//   karma start lms/static/karma_lms_coffee.conf.js --browsers=BROWSER
-// --coverage --junitreportpath=<xunit_report_path> --coveragereportpath=<report_path>
-//
-// where `BROWSER` could be Chrome or Firefox.
-//
+// Karma config for lms-coffee suite.
+// Docs in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */

From 855fdbd3876b621c8bd5a79c8d3ac634b039f7b8 Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Tue, 3 May 2016 16:40:17 +0500
Subject: [PATCH 03/11] Moved all logic from karma config files to
 karma.common.conf.js.

The config files just declare lists of files.
---
 cms/static/karma_cms.conf.js                  | 58 ++++-------
 cms/static/karma_cms_squire.conf.js           | 54 +++--------
 .../xmodule/xmodule/js/karma_xmodule.conf.js  | 69 ++++---------
 common/static/common/js/karma.common.conf.js  | 97 ++++++++++++++++---
 common/static/karma_common.conf.js            | 64 ++++--------
 common/static/karma_common_requirejs.conf.js  | 65 ++++---------
 lms/static/karma_lms.conf.js                  | 54 +++--------
 lms/static/karma_lms_coffee.conf.js           | 51 +++-------
 8 files changed, 207 insertions(+), 305 deletions(-)

diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js
index 956c7c65b0..78bc1818fd 100644
--- a/cms/static/karma_cms.conf.js
+++ b/cms/static/karma_cms.conf.js
@@ -5,10 +5,10 @@
 /*jshint -W079 */
 'use strict';
 var path = require('path');
-var _ = require('underscore');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var libraryFiles = [
+var files = {
+    libraryFiles: [
     {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: false},
     {pattern: 'xmodule_js/common_static/js/src/utility.js', included: false},
     {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: false},
@@ -67,58 +67,36 @@ var libraryFiles = [
     {pattern: 'edx-ui-toolkit/js/**/*.js', included: false},
 
     {pattern: 'common/js/utils/require-serial.js', included: true}
-];
+    ],
 
-// Paths to source JavaScript files
-var sourceFiles = [
+    sourceFiles: [
     {pattern: 'coffee/src/**/!(*spec).js', included: false},
     {pattern: 'js/**/!(*spec).js', included: false},
     {pattern: 'common/js/**/!(*spec).js', included: false}
-];
+    ],
 
-// Paths to spec (test) JavaScript files
-var specFiles = [
+    specFiles: [
     {pattern: 'coffee/spec/**/*spec.js', included: false},
     {pattern: 'js/spec/**/*spec.js', included: false},
     {pattern: 'js/certificates/spec/**/*spec.js', included: false}
-];
+    ],
 
-// Paths to fixture files
-var fixtureFiles = [
+    fixtureFiles: [
     {pattern: 'coffee/fixtures/**/*.underscore', included: false},
     {pattern: 'templates/**/*.underscore', included: false},
     {pattern: 'common/templates/**/*.underscore', included: false}
-];
+    ],
 
-// override fixture path and other config.
-var runAndConfigFiles = [
+    runAndConfigFiles: [
     {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
     'coffee/spec/main.js'
-];
-
-// do not include tests or libraries
-// (these files will be instrumented by Istanbul)
-var preprocessors = configModule.getPreprocessorObject(_.flatten([sourceFiles, specFiles]));
-
-module.exports = function (config) {
-    var commonConfig = configModule.getConfig(config),
-        files = _.flatten([libraryFiles, sourceFiles, specFiles, fixtureFiles, runAndConfigFiles]),
-        localConfig;
-
-    // add nocache in files if coverage is not set
-    if (!config.coverage) {
-        files.forEach(function (f) {
-            if (_.isObject(f)) {
-                f.nocache = true;
-            }
-        });
-    }
-
-    localConfig = {
-        files: files,
-        preprocessors: preprocessors
-    };
-
-    config.set(_.extend(commonConfig, localConfig));
+    ]
+};
+
+module.exports = function (config) {
+    configModule.configure({
+        config: config,
+        files: files
+    });
 };
 
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index fbd4c04986..b5baa05714 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -5,10 +5,10 @@
 /*jshint -W079 */
 'use strict';
 var path = require('path');
-var _ = require('underscore');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var libraryFiles = [
+var files = {
+    libraryFiles: [
     {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js', included: false},
     {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: false},
     {pattern: 'xmodule_js/common_static/js/src/utility.js', included: false},
@@ -52,59 +52,37 @@ var libraryFiles = [
     },
     {pattern: 'xmodule_js/common_static/js/vendor/requirejs/text.js', included: false},
     {pattern: 'common/js/utils/require-serial.js', included: true}
-];
+    ],
 
-// Paths to source JavaScript files
-var sourceFiles = [
+    sourceFiles: [
     {pattern: 'coffee/src/**/*.js', included: false},
     {pattern: 'js/collections/**/*.js', included: false},
     {pattern: 'js/models/**/*.js', included: false},
     {pattern: 'js/utils/**/*.js', included: false},
     {pattern: 'js/views/**/*.js', included: false},
     {pattern: 'common/js/**/*.js', included: false}
-];
+    ],
 
-// Paths to spec (test) JavaScript files
-var specFiles = [
+    specFiles: [
     {pattern: 'coffee/spec/**/*.js', included: false},
     {pattern: 'js/spec/**/*.js', included: false}
-];
+    ],
 
-// Paths to fixture files
-var fixtureFiles = [
+    fixtureFiles: [
     {pattern: 'coffee/fixtures/**/*.*', included: false},
     {pattern: 'templates/**/*.*', included: false},
     {pattern: 'common/templates/**/*.*', included: false}
-];
+    ],
 
-// override fixture path and other config.
-var runAndConfigFiles = [
+    runAndConfigFiles: [
     {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
     'coffee/spec/main_squire.js'
-];
-
-// do not include tests or libraries
-// (these files will be instrumented by Istanbul)
-var preprocessors = configModule.getPreprocessorObject(_.flatten([sourceFiles, specFiles]));
+    ]
+};
 
 module.exports = function (config) {
-    var commonConfig = configModule.getConfig(config),
-        files = _.flatten([libraryFiles, sourceFiles, specFiles, fixtureFiles, runAndConfigFiles]),
-        localConfig;
-
-    // add nocache in files if coverage is not set
-    if (!config.coverage) {
-        files.forEach(function (f) {
-            if (_.isObject(f)) {
-                f.nocache = true;
-            }
-        });
-    }
-
-    localConfig = {
-        files: files,
-        preprocessors: preprocessors
-    };
-
-    config.set(_.extend(commonConfig, localConfig));
+    configModule.configure({
+        config: config,
+        files: files
+    });
 };
diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
index b3ee098cdc..80f52b8d3f 100644
--- a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
+++ b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
@@ -6,11 +6,10 @@
 
 'use strict';
 var path = require('path');
-var _ = require('underscore');
 var configModule = require(path.join(__dirname, 'common_static/common/js/karma.common.conf.js'));
 
-var libraryFiles = [
-    // override fixture path and other config.
+var files = {
+    libraryFiles: [
     {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
 
     {pattern: 'common_static/js/vendor/jquery.min.js', included: true},
@@ -46,62 +45,32 @@ var libraryFiles = [
     {pattern: 'common_static/edx-pattern-library/js/modernizr-custom.js', included: false},
     {pattern: 'common_static/edx-pattern-library/js/afontgarde.js', included: false},
     {pattern: 'common_static/edx-pattern-library/js/edx-icons.js', included: false}
-];
+    ],
 
-// Paths to source JavaScript files
-var sourceFiles = [
-    {pattern: 'src/xmodule.js', included: true, skipInstrument: true},
+    sourceFiles: [
+    {pattern: 'src/xmodule.js', included: true, ignoreCoverage: true},
     {pattern: 'src/**/*.js', included: true}
-];
+    ],
 
-// Paths to spec (test) JavaScript files
-var specFiles = [
-    {pattern: 'spec/helper.js', included: true, skipInstrument: true},
+    specFiles: [
+    {pattern: 'spec/helper.js', included: true, ignoreCoverage: true},
     {pattern: 'spec/**/*.js', included: true}
-];
+    ],
 
-// Paths to fixture files
-var fixtureFiles = [
+    fixtureFiles: [
     {pattern: 'fixtures/*.*', included: false, served: true}
-];
+    ],
 
-var runAndConfigFiles = [
+    runAndConfigFiles: [
     {pattern: 'karma_runner.js', included: true}
-];
-
-// do not include tests or libraries
-// (these files will be instrumented by Istanbul)
-var preprocessors = (function () {
-    var preprocessFiles = {};
-    _.flatten([sourceFiles, specFiles]).forEach(function (file) {
-        var pattern = _.isObject(file) ? file.pattern : file;
-
-        if (!file.skipInstrument) {
-            preprocessFiles[pattern] = ['coverage'];
-        }
-    });
-
-    return preprocessFiles;
-}());
+    ]
+};
 
 module.exports = function (config) {
-    var commonConfig = configModule.getConfig(config, false),
-        files = _.flatten([libraryFiles, sourceFiles, specFiles, fixtureFiles, runAndConfigFiles]),
-        localConfig;
-
-    // add nocache in files if coverage is not set
-    if (!config.coverage) {
-        files.forEach(function (f) {
-            if (_.isObject(f)) {
-                f.nocache = true;
-            }
-        });
-    }
-
-    localConfig = {
+    configModule.configure({
+        config: config,
         files: files,
-        preprocessors: preprocessors
-    };
-
-    config.set(_.extend(commonConfig, localConfig));
+        normalizePathsForCoverageFunc: function(appRoot, pattern) { return pattern; },
+        useRequireJs: false
+    });
 };
diff --git a/common/static/common/js/karma.common.conf.js b/common/static/common/js/karma.common.conf.js
index 7d678adae4..6533e5b6e3 100644
--- a/common/static/common/js/karma.common.conf.js
+++ b/common/static/common/js/karma.common.conf.js
@@ -124,26 +124,60 @@ function junitSettings(config) {
     };
 }
 
-var getPreprocessorObject = function (files) {
-    var preprocessFiles = {};
+var normalizePathsForCoverage = function(files, normalize_func) {
+    var filesForCoverage = {};
 
     files.forEach(function (file) {
+        if (_.isObject(file) && file.ignoreCoverage) { return; }
+
         var pattern = _.isObject(file) ? file.pattern : file;
-
-        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 (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\//, ''));
+            }
         }
-
-        preprocessFiles[pattern] = ['coverage'];
+        filesForCoverage[pattern] = ['coverage'];
     });
 
-    return preprocessFiles;
+    return filesForCoverage;
 };
 
-var getConfig = function (config, useRequireJs) {
+/**
+ * Sets nocache on each file in the list.
+ * @param {Object} files
+ * @param {Bool} enable
+ * @return {Object}
+ */
+var setNocache = function (files, enable) {
+    files.forEach(function (f) {
+        if (_.isObject(f)) {
+            f.nocache = enable;
+        }
+    });
+    return files;
+};
+
+/**
+ * Sets defaults for each file pattern.
+ * @param {Object} files
+ * @return {Object}
+ */
+var setDefaults = function (files) {
+    return files.map(function (f) {
+        var file = _.isObject(f) ? f : {pattern: f};
+        if (!file.included) {
+            f.included = false;
+        }
+        return file;
+    });
+};
+
+var getBaseConfig = function (config, useRequireJs) {
     useRequireJs = useRequireJs === undefined ? true : useRequireJs;
 
     var getFrameworkFiles = function () {
@@ -257,8 +291,43 @@ var getConfig = function (config, useRequireJs) {
     };
 };
 
+var configure = function(data) {
+    var baseConfig = getBaseConfig(data.config, data.useRequireJs);
+
+    var files = _.flatten(
+      _.map(
+            ['libraryFiles', 'sourceFiles', 'specFiles', 'fixtureFiles', 'runAndConfigFiles'],
+            function(item) { return data.files[item]; }
+        )
+    );
+
+    files = setDefaults(files);
+
+    // With nocache=true, Karma always serves the latest files from disk.
+    // However, that prevents coverage tracking from working.
+    // So we only set it if coverage tracking is off.
+    setNocache(files, !data.config.coverage);
+
+    var filesForCoverage = _.flatten(
+      _.map(
+            ['sourceFiles', 'specFiles'],
+            function(item) { return data.files[item]; }
+        )
+    );
+
+    var preprocessors = _.extend(
+      {},
+      data.preprocessors,
+      normalizePathsForCoverage(filesForCoverage, data.normalizePathsForCoverageFunc)
+    );
+
+    data.config.set(_.extend(baseConfig, {
+        files: files,
+        preprocessors: preprocessors
+    }));
+};
+
 module.exports = {
-    getConfig: getConfig,
-    getPreprocessorObject: getPreprocessorObject,
+    configure: configure,
     appRoot: appRoot
 };
diff --git a/common/static/karma_common.conf.js b/common/static/karma_common.conf.js
index d9864bdc58..43e3ac96e8 100644
--- a/common/static/karma_common.conf.js
+++ b/common/static/karma_common.conf.js
@@ -5,12 +5,10 @@
 /*jshint -W079 */
 'use strict';
 var path = require('path');
-var _ = require('underscore');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-// Files to load by Karma
-var libraryFiles = [
-    // override fixture path and other config.
+var files = {
+    libraryFiles: [
     {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
 
     {pattern: 'js/vendor/jquery.min.js', included: true},
@@ -34,62 +32,40 @@ var libraryFiles = [
     {pattern: 'edx-pattern-library/js/modernizr-custom.js', included: true},
     {pattern: 'edx-pattern-library/js/afontgarde.js', included: true},
     {pattern: 'edx-pattern-library/js/edx-icons.js', included: true}
-];
+    ],
 
-// Paths to source JavaScript files
-var sourceFiles = [
+    sourceFiles: [
     {pattern: 'js/xblock/**/*.js', included: true},
     {pattern: 'coffee/src/**/*.js', included: true},
     {pattern: 'js/src/**/*.js', included: true},
     {pattern: 'js/capa/src/**/*.js', included: true}
-];
+    ],
 
-// Paths to spec (test) JavaScript files
-var specFiles = [
+    specFiles: [
     {pattern: 'coffee/spec/**/*.js', included: true},
     {pattern: 'js/spec/**/*.js', included: true},
     {pattern: 'js/capa/spec/**/*.js', included: true}
-];
+    ],
 
-// Paths to fixture files
-var fixtureFiles = [
+    fixtureFiles: [
     {pattern: 'js/fixtures/**/*.html', included: false},
     {pattern: 'js/capa/fixtures/**/*.html', included: false},
     {pattern: 'common/templates/**/*.underscore', included: false}
-];
+    ],
 
-// do not include tests or libraries
-// (these files will be instrumented by Istanbul)
-var preprocessors = (function () {
-    var preprocessFiles = {};
+    runAndConfigFiles: [
+    ]
+};
 
-    _.flatten([sourceFiles, specFiles]).forEach(function (file) {
-        var pattern = _.isObject(file) ? file.pattern : file;
-        pattern = path.join(configModule.appRoot, '/common/static/' + pattern);
-        preprocessFiles[pattern] = ['coverage'];
-    });
-
-    return preprocessFiles;
-}());
+var normalizePathsForCoverageFunc = function (appRoot, pattern) {
+    return path.join(appRoot, '/common/static/' + pattern);
+};
 
 module.exports = function (config) {
-    var commonConfig = configModule.getConfig(config, false),
-        files = _.flatten([libraryFiles, sourceFiles, specFiles, fixtureFiles]),
-        localConfig;
-
-    // add nocache in files if coverage is not set
-    if (!config.coverage) {
-        files.forEach(function (f) {
-            if (_.isObject(f)) {
-                f.nocache = true;
-            }
-        });
-    }
-
-    localConfig = {
+    configModule.configure({
+        config: config,
         files: files,
-        preprocessors: preprocessors
-    };
-
-    config.set(_.extend(commonConfig, localConfig));
+        normalizePathsForCoverageFunc: normalizePathsForCoverageFunc,
+        useRequireJs: false
+    });
 };
diff --git a/common/static/karma_common_requirejs.conf.js b/common/static/karma_common_requirejs.conf.js
index b06bb38837..f50e59c975 100644
--- a/common/static/karma_common_requirejs.conf.js
+++ b/common/static/karma_common_requirejs.conf.js
@@ -6,10 +6,10 @@
 
 'use strict';
 var path = require('path');
-var _ = require('underscore');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var libraryFiles = [
+var files = {
+    libraryFiles: [
     {pattern: 'js/vendor/jquery.min.js', included: false},
     {pattern: 'js/vendor/jasmine-imagediff.js', included: false},
     {pattern: 'js/libs/jasmine-stealth.js', included: false},
@@ -30,61 +30,34 @@ var libraryFiles = [
     {pattern: 'js/vendor/requirejs/text.js', included: false},
     {pattern: 'js/vendor/sinon-1.17.0.js', included: false},
     {pattern: 'common/js/utils/require-serial.js', included: true}
-];
+    ],
 
-// Paths to source JavaScript files
-var sourceFiles = [
+    sourceFiles: [
     {pattern: 'common/js/**/!(*spec).js', included: false}
-];
+    ],
 
-// Paths to spec (test) JavaScript files
-var specFiles = [
+    specFiles: [
     {pattern: 'common/js/spec/**/*spec.js', included: false}
-];
+    ],
 
-// Paths to fixture files
-var fixtureFiles = [
+    fixtureFiles: [
     {pattern: 'common/templates/**/*.*', included: false}
-];
+    ],
 
-// override fixture path and other config.
-var runAndConfigFiles = [
+    runAndConfigFiles: [
     {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
     'common/js/spec/main_requirejs.js'
-];
+    ]
+};
 
-// do not include tests or libraries
-// (these files will be instrumented by Istanbul)
-var preprocessors = (function () {
-    var preprocessFiles = {};
-
-    _.flatten([sourceFiles, specFiles]).forEach(function (file) {
-        var pattern = _.isObject(file) ? file.pattern : file;
-        pattern = path.join(configModule.appRoot, '/common/static/' + pattern);
-        preprocessFiles[pattern] = ['coverage'];
-    });
-
-    return preprocessFiles;
-}());
+var normalizePathsForCoverageFunc = function (appRoot, pattern) {
+    return path.join(appRoot, '/common/static/' + pattern);
+};
 
 module.exports = function (config) {
-    var commonConfig = configModule.getConfig(config),
-        files = _.flatten([libraryFiles, sourceFiles, specFiles, fixtureFiles, runAndConfigFiles]),
-        localConfig;
-
-    // add nocache in files if coverage is not set
-    if (!config.coverage) {
-        files.forEach(function (f) {
-            if (_.isObject(f)) {
-                f.nocache = true;
-            }
-        });
-    }
-
-    localConfig = {
+    configModule.configure({
+        config: config,
         files: files,
-        preprocessors: preprocessors
-    };
-
-    config.set(_.extend(commonConfig, localConfig));
+        normalizePathsForCoverageFunc: normalizePathsForCoverageFunc
+    });
 };
diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js
index b49932ec74..cec0b85250 100644
--- a/lms/static/karma_lms.conf.js
+++ b/lms/static/karma_lms.conf.js
@@ -5,10 +5,10 @@
 /*jshint -W079 */
 'use strict';
 var path = require('path');
-var _ = require('underscore');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var libraryFiles = [
+var files = {
+    libraryFiles: [
     {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: false},
     {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: false},
     {pattern: 'xmodule_js/common_static/js/src/logger.js', included: false},
@@ -57,10 +57,9 @@ var libraryFiles = [
     {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js', included: true},
     {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
     {pattern: 'common/js/utils/require-serial.js', included: true}
-];
+    ],
 
-// Paths to source JavaScript files
-var sourceFiles = [
+    sourceFiles: [
     {pattern: 'js/**/!(*spec).js', included: false},
     {pattern: 'coffee/src/**/*.js', included: false},
     {pattern: 'common/js/**/*.js', included: false},
@@ -69,17 +68,15 @@ var sourceFiles = [
     {pattern: 'support/js/**/!(*spec).js', included: false},
     {pattern: 'teams/js/**/!(*spec).js', included: false},
     {pattern: 'xmodule_js/common_static/coffee/**/*.js', included: false}
-];
+    ],
 
-// Paths to spec (test) JavaScript files
-var specFiles = [
+    specFiles: [
     {pattern: 'js/spec/**/*spec.js', included: false},
     {pattern: 'teams/js/spec/**/*spec.js', included: false},
     {pattern: 'support/js/spec/**/*spec.js', included: false}
-];
+    ],
 
-// Paths to fixture files
-var fixtureFiles = [
+    fixtureFiles: [
     {pattern: 'js/fixtures/**/*.html', included: false},
     {pattern: 'templates/instructor/instructor_dashboard_2/**/*.*', included: false},
     {pattern: 'templates/dashboard/**/*.*', included: false},
@@ -103,36 +100,17 @@ var fixtureFiles = [
     {pattern: 'templates/ccx/**/*.*', included: false},
     {pattern: 'templates/commerce/receipt.underscore', included: false},
     {pattern: 'templates/api_admin/**/*.*', included: false}
-];
+    ],
 
-// override fixture path and other config.
-var runAndConfigFiles = [
+    runAndConfigFiles: [
     {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
     {pattern: 'js/spec/main.js', included: true}
-];
-
-// do not include tests or libraries
-// (these files will be instrumented by Istanbul)
-var preprocessors = configModule.getPreprocessorObject(_.flatten([sourceFiles, specFiles]));
+    ]
+};
 
 module.exports = function (config) {
-    var commonConfig = configModule.getConfig(config),
-        files = _.flatten([libraryFiles, sourceFiles, specFiles, fixtureFiles, runAndConfigFiles]),
-        localConfig;
-
-    // add nocache in files if coverage is not set
-    if (!config.coverage) {
-        files.forEach(function (f) {
-            if (_.isObject(f)) {
-                f.nocache = true;
-            }
-        });
-    }
-
-    localConfig = {
-        files: files,
-        preprocessors: preprocessors
-    };
-
-    config.set(_.extend(commonConfig, localConfig));
+    configModule.configure({
+        config: config,
+        files: files
+    });
 };
diff --git a/lms/static/karma_lms_coffee.conf.js b/lms/static/karma_lms_coffee.conf.js
index d15d212497..69b7ba2f72 100644
--- a/lms/static/karma_lms_coffee.conf.js
+++ b/lms/static/karma_lms_coffee.conf.js
@@ -6,14 +6,12 @@
 
 'use strict';
 var path = require('path');
-var _ = require('underscore');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var libraryFiles = [
-    // override fixture path and other config.
+var files = {
+    libraryFiles: [
     {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
 
-    // vendor files
     {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: true},
     {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: true},
     {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: true},
@@ -43,45 +41,28 @@ var libraryFiles = [
     {pattern: 'xmodule_js/common_static/edx-pattern-library/js/modernizr-custom.js', included: false},
     {pattern: 'xmodule_js/common_static/edx-pattern-library/js/afontgarde.js', included: false},
     {pattern: 'xmodule_js/common_static/edx-pattern-library/js/edx-icons.js', included: false}
-];
+    ],
 
-// source files
-var sourceFiles = [
+    sourceFiles: [
     {pattern: 'coffee/src/**/*.js', included: true}
-];
+    ],
 
-// spec files
-var specFiles = [
+    specFiles: [
     {pattern: 'coffee/spec/**/*.js', included: true}
-];
+    ],
 
-// Fixtures
-var fixtureFiles = [
+    fixtureFiles: [
     {pattern: 'coffee/fixtures/**/*.*', included: true}
-];
+    ],
 
-// do not include tests or libraries
-// (these files will be instrumented by Istanbul)
-var preprocessors = configModule.getPreprocessorObject(_.flatten([sourceFiles, specFiles]));
+    runAndConfigFiles: [
+    ]
+};
 
 module.exports = function (config) {
-    var commonConfig = configModule.getConfig(config, false),
-        files = _.flatten([libraryFiles, sourceFiles, specFiles, fixtureFiles]),
-        localConfig;
-
-    // add nocache in files if coverage is not set
-    if (!config.coverage) {
-        files.forEach(function (f) {
-            if (_.isObject(f)) {
-                f.nocache = true;
-            }
-        });
-    }
-
-    localConfig = {
+    configModule.configure({
+        config: config,
         files: files,
-        preprocessors: preprocessors
-    };
-
-    config.set(_.extend(commonConfig, localConfig));
+        useRequireJs: false
+    });
 };

From 713c79e0aadb8253d87f642b9342ee21a4a5621f Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Tue, 3 May 2016 21:59:53 +0500
Subject: [PATCH 04/11] Set included=false by default because we want to move
 towards RequireJs.

---
 cms/static/karma_cms.conf.js                  | 129 +++++++-------
 cms/static/karma_cms_squire.conf.js           | 104 +++++------
 .../xmodule/xmodule/js/karma_xmodule.conf.js  |  82 +++++----
 common/static/common/js/karma.common.conf.js  |  12 +-
 common/static/karma_common.conf.js            |  67 ++++---
 common/static/karma_common_requirejs.conf.js  |  51 +++---
 lms/static/karma_lms.conf.js                  | 163 +++++++++---------
 lms/static/karma_lms_coffee.conf.js           |  69 ++++----
 8 files changed, 320 insertions(+), 357 deletions(-)

diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js
index 78bc1818fd..6e4a645a5c 100644
--- a/cms/static/karma_cms.conf.js
+++ b/cms/static/karma_cms.conf.js
@@ -9,87 +9,77 @@ var configModule = require(path.join(__dirname, '../../common/static/common/js/k
 
 var files = {
     libraryFiles: [
-    {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/src/utility.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.simulate.js', included: false},
-    {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: false},
-    {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js', included: false},
-    {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/backbone-associations-min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/backbone-relational.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.leanModal.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.ajaxQueue.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.form.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/sinon-1.17.0.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/Squire.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/libs/jasmine-stealth.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/**/*.js', included: false},
-    {pattern: 'xmodule_js/src/xmodule.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/draggabilly.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/date.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/domReady.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/xblock/**/*.js', included: false},
-    {pattern: 'xmodule_js/common_static/coffee/src/xblock/**/*.js', included: false},
-    {
-        pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js',
-        included: false
-    },
-    {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js', included: false},
-    {
-        pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-process.js',
-        included: false
-    },
-    {
-        pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-validate.js',
-        included: false
-    },
-    {pattern: 'xmodule_js/common_static/js/vendor/mock-ajax.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/requirejs/text.js', included: false},
-    {pattern: 'edx-ui-toolkit/js/utils/global-loader.js', included: false},
-    {pattern: 'edx-pattern-library/js/modernizr-custom.js', included: false},
-    {pattern: 'edx-pattern-library/js/afontgarde.js', included: false},
-    {pattern: 'edx-pattern-library/js/edx-icons.js', included: false},
-    {pattern: 'edx-pattern-library/js/**/*.js', included: false},
-    {pattern: 'edx-ui-toolkit/js/**/*.js', included: false},
+        {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js'},
+        {pattern: 'xmodule_js/common_static/js/src/utility.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.simulate.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/backbone-associations-min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/backbone-relational.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.leanModal.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.ajaxQueue.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.form.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/sinon-1.17.0.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/Squire.js'},
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-stealth.js'},
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js'},
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/**/*.js'},
+        {pattern: 'xmodule_js/src/xmodule.js'},
+        {pattern: 'xmodule_js/common_static/js/test/i18n.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/draggabilly.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/date.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/domReady.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js'},
+        {pattern: 'xmodule_js/common_static/js/xblock/**/*.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/xblock/**/*.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-process.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-validate.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/mock-ajax.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/text.js'},
+        {pattern: 'edx-ui-toolkit/js/utils/global-loader.js'},
+        {pattern: 'edx-pattern-library/js/modernizr-custom.js'},
+        {pattern: 'edx-pattern-library/js/afontgarde.js'},
+        {pattern: 'edx-pattern-library/js/edx-icons.js'},
+        {pattern: 'edx-pattern-library/js/**/*.js'},
+        {pattern: 'edx-ui-toolkit/js/**/*.js'},
 
-    {pattern: 'common/js/utils/require-serial.js', included: true}
+        {pattern: 'common/js/utils/require-serial.js', included: true}
     ],
 
     sourceFiles: [
-    {pattern: 'coffee/src/**/!(*spec).js', included: false},
-    {pattern: 'js/**/!(*spec).js', included: false},
-    {pattern: 'common/js/**/!(*spec).js', included: false}
+        {pattern: 'coffee/src/**/!(*spec).js'},
+        {pattern: 'js/**/!(*spec).js'},
+        {pattern: 'common/js/**/!(*spec).js'}
     ],
 
     specFiles: [
-    {pattern: 'coffee/spec/**/*spec.js', included: false},
-    {pattern: 'js/spec/**/*spec.js', included: false},
-    {pattern: 'js/certificates/spec/**/*spec.js', included: false}
+        {pattern: 'coffee/spec/**/*spec.js'},
+        {pattern: 'js/spec/**/*spec.js'},
+        {pattern: 'js/certificates/spec/**/*spec.js'}
     ],
 
     fixtureFiles: [
-    {pattern: 'coffee/fixtures/**/*.underscore', included: false},
-    {pattern: 'templates/**/*.underscore', included: false},
-    {pattern: 'common/templates/**/*.underscore', included: false}
+        {pattern: 'coffee/fixtures/**/*.underscore'},
+        {pattern: 'templates/**/*.underscore'},
+        {pattern: 'common/templates/**/*.underscore'}
     ],
 
-    runAndConfigFiles: [
-    {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
-    'coffee/spec/main.js'
+    runFiles: [
+        {pattern: 'coffee/spec/main.js', included: true}
     ]
 };
 
@@ -99,4 +89,3 @@ module.exports = function (config) {
         files: files
     });
 };
-
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index b5baa05714..e72bdf2025 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -9,74 +9,64 @@ var configModule = require(path.join(__dirname, '../../common/static/common/js/k
 
 var files = {
     libraryFiles: [
-    {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js', included: false},
-    {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/src/utility.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js', included: false},
-    {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: false},
-    {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js', included: false},
-    {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/backbone-associations-min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.leanModal.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.form.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/sinon-1.17.0.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/Squire.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/domReady.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
-    {pattern: 'xmodule_js/src/xmodule.js', included: false},
-    {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/xblock/**/*.js', included: false},
-    {pattern: 'xmodule_js/common_static/coffee/src/xblock/**/*.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js', included: false},
-    {
-        pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js',
-        included: false
-    },
-    {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js', included: false},
-    {
-        pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-process.js',
-        included: false
-    },
-    {
-        pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-validate.js',
-        included: false
-    },
-    {pattern: 'xmodule_js/common_static/js/vendor/requirejs/text.js', included: false},
-    {pattern: 'common/js/utils/require-serial.js', included: true}
+        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js'},
+        {pattern: 'xmodule_js/common_static/js/src/utility.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/backbone-associations-min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.leanModal.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.form.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/sinon-1.17.0.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/Squire.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/domReady.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js'},
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
+        {pattern: 'xmodule_js/src/xmodule.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js'},
+        {pattern: 'xmodule_js/common_static/js/test/i18n.js'},
+        {pattern: 'xmodule_js/common_static/js/xblock/**/*.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/xblock/**/*.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-process.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-validate.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/text.js'},
+        {pattern: 'common/js/utils/require-serial.js', included: true}
     ],
 
     sourceFiles: [
-    {pattern: 'coffee/src/**/*.js', included: false},
-    {pattern: 'js/collections/**/*.js', included: false},
-    {pattern: 'js/models/**/*.js', included: false},
-    {pattern: 'js/utils/**/*.js', included: false},
-    {pattern: 'js/views/**/*.js', included: false},
-    {pattern: 'common/js/**/*.js', included: false}
+        {pattern: 'coffee/src/**/*.js'},
+        {pattern: 'js/collections/**/*.js'},
+        {pattern: 'js/models/**/*.js'},
+        {pattern: 'js/utils/**/*.js'},
+        {pattern: 'js/views/**/*.js'},
+        {pattern: 'common/js/**/*.js'}
     ],
 
     specFiles: [
-    {pattern: 'coffee/spec/**/*.js', included: false},
-    {pattern: 'js/spec/**/*.js', included: false}
+        {pattern: 'coffee/spec/**/*.js'},
+        {pattern: 'js/spec/**/*.js'}
     ],
 
     fixtureFiles: [
-    {pattern: 'coffee/fixtures/**/*.*', included: false},
-    {pattern: 'templates/**/*.*', included: false},
-    {pattern: 'common/templates/**/*.*', included: false}
+        {pattern: 'coffee/fixtures/**/*.*'},
+        {pattern: 'templates/**/*.*'},
+        {pattern: 'common/templates/**/*.*'}
     ],
 
-    runAndConfigFiles: [
-    {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
-    'coffee/spec/main_squire.js'
+    runFiles: [
+        {pattern: 'coffee/spec/main_squire.js', included: true}
     ]
 };
 
diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
index 80f52b8d3f..ad3ea0dd19 100644
--- a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
+++ b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
@@ -10,59 +10,57 @@ var configModule = require(path.join(__dirname, 'common_static/common/js/karma.c
 
 var files = {
     libraryFiles: [
-    {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
-
-    {pattern: 'common_static/js/vendor/jquery.min.js', included: true},
-    {pattern: 'common_static/js/test/i18n.js', included: true},
-    {pattern: 'common_static/coffee/src/ajax_prefix.js', included: true},
-    {pattern: 'common_static/js/src/logger.js', included: true},
-    {pattern: 'common_static/js/vendor/jasmine-imagediff.js', included: true},
-    {pattern: 'common_static/js/libs/jasmine-waituntil.js', included: true},
-    {pattern: 'common_static/js/libs/jasmine-extensions.js', included: true},
-    {pattern: 'common_static/js/vendor/requirejs/require.js', included: true},
-    {pattern: 'RequireJS-namespace-undefine.js', included: true},
-    {pattern: 'common_static/js/vendor/jquery-ui.min.js', included: true},
-    {pattern: 'common_static/js/vendor/jquery.ui.draggable.js', included: true},
-    {pattern: 'common_static/js/vendor/jquery.cookie.js', included: true},
-    {pattern: 'common_static/js/vendor/json2.js', included: true},
-    {pattern: 'common_static/common/js/vendor/underscore.js', included: true},
-    {pattern: 'common_static/common/js/vendor/backbone.js', included: true},
-    {pattern: 'common_static/js/vendor/jquery.leanModal.js', included: true},
-    {pattern: 'common_static/js/vendor/CodeMirror/codemirror.js', included: true},
-    {pattern: 'common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js', included: true},
-    {pattern: 'common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min.js', included: true},
-    {pattern: 'common_static/js/vendor/jquery.timeago.js', included: true},
-    {pattern: 'common_static/js/vendor/sinon-1.17.0.js', included: true},
-    {pattern: 'common_static/js/test/add_ajax_prefix.js', included: true},
-    {pattern: 'common_static/js/src/utility.js', included: true},
-    {pattern: 'public/js/split_test_staff.js', included: true},
-    {pattern: 'common_static/js/src/accessibility_tools.js', included: true},
-    {pattern: 'common_static/js/vendor/moment.min.js', included: true},
-    {pattern: 'spec/main_requirejs.js', included: true},
-    {pattern: 'src/word_cloud/d3.min.js', included: true},
-    {pattern: 'common_static/js/vendor/draggabilly.js', included: false},
-    {pattern: 'common_static/edx-ui-toolkit/js/utils/global-loader.js', included: true},
-    {pattern: 'common_static/edx-pattern-library/js/modernizr-custom.js', included: false},
-    {pattern: 'common_static/edx-pattern-library/js/afontgarde.js', included: false},
-    {pattern: 'common_static/edx-pattern-library/js/edx-icons.js', included: false}
+        {pattern: 'common_static/js/vendor/jquery.min.js', included: true},
+        {pattern: 'common_static/js/test/i18n.js', included: true},
+        {pattern: 'common_static/coffee/src/ajax_prefix.js', included: true},
+        {pattern: 'common_static/js/src/logger.js', included: true},
+        {pattern: 'common_static/js/vendor/jasmine-imagediff.js', included: true},
+        {pattern: 'common_static/js/libs/jasmine-waituntil.js', included: true},
+        {pattern: 'common_static/js/libs/jasmine-extensions.js', included: true},
+        {pattern: 'common_static/js/vendor/requirejs/require.js', included: true},
+        {pattern: 'RequireJS-namespace-undefine.js', included: true},
+        {pattern: 'common_static/js/vendor/jquery-ui.min.js', included: true},
+        {pattern: 'common_static/js/vendor/jquery.ui.draggable.js', included: true},
+        {pattern: 'common_static/js/vendor/jquery.cookie.js', included: true},
+        {pattern: 'common_static/js/vendor/json2.js', included: true},
+        {pattern: 'common_static/common/js/vendor/underscore.js', included: true},
+        {pattern: 'common_static/common/js/vendor/backbone.js', included: true},
+        {pattern: 'common_static/js/vendor/jquery.leanModal.js', included: true},
+        {pattern: 'common_static/js/vendor/CodeMirror/codemirror.js', included: true},
+        {pattern: 'common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js', included: true},
+        {pattern: 'common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min.js', included: true},
+        {pattern: 'common_static/js/vendor/jquery.timeago.js', included: true},
+        {pattern: 'common_static/js/vendor/sinon-1.17.0.js', included: true},
+        {pattern: 'common_static/js/test/add_ajax_prefix.js', included: true},
+        {pattern: 'common_static/js/src/utility.js', included: true},
+        {pattern: 'public/js/split_test_staff.js', included: true},
+        {pattern: 'common_static/js/src/accessibility_tools.js', included: true},
+        {pattern: 'common_static/js/vendor/moment.min.js', included: true},
+        {pattern: 'spec/main_requirejs.js', included: true},
+        {pattern: 'src/word_cloud/d3.min.js', included: true},
+        {pattern: 'common_static/js/vendor/draggabilly.js'},
+        {pattern: 'common_static/edx-ui-toolkit/js/utils/global-loader.js', included: true},
+        {pattern: 'common_static/edx-pattern-library/js/modernizr-custom.js'},
+        {pattern: 'common_static/edx-pattern-library/js/afontgarde.js'},
+        {pattern: 'common_static/edx-pattern-library/js/edx-icons.js'}
     ],
 
     sourceFiles: [
-    {pattern: 'src/xmodule.js', included: true, ignoreCoverage: true},
-    {pattern: 'src/**/*.js', included: true}
+        {pattern: 'src/xmodule.js', included: true, ignoreCoverage: true},
+        {pattern: 'src/**/*.js', included: true}
     ],
 
     specFiles: [
-    {pattern: 'spec/helper.js', included: true, ignoreCoverage: true},
-    {pattern: 'spec/**/*.js', included: true}
+        {pattern: 'spec/helper.js', included: true, ignoreCoverage: true},
+        {pattern: 'spec/**/*.js', included: true}
     ],
 
     fixtureFiles: [
-    {pattern: 'fixtures/*.*', included: false, served: true}
+        {pattern: 'fixtures/*.*'}
     ],
 
-    runAndConfigFiles: [
-    {pattern: 'karma_runner.js', included: true}
+    runFiles: [
+        {pattern: 'karma_runner.js', included: true}
     ]
 };
 
diff --git a/common/static/common/js/karma.common.conf.js b/common/static/common/js/karma.common.conf.js
index 6533e5b6e3..a279652e5b 100644
--- a/common/static/common/js/karma.common.conf.js
+++ b/common/static/common/js/karma.common.conf.js
@@ -295,12 +295,16 @@ var configure = function(data) {
     var baseConfig = getBaseConfig(data.config, data.useRequireJs);
 
     var files = _.flatten(
-      _.map(
-            ['libraryFiles', 'sourceFiles', 'specFiles', 'fixtureFiles', 'runAndConfigFiles'],
-            function(item) { return data.files[item]; }
+        _.map(
+            ['libraryFiles', 'sourceFiles', 'specFiles', 'fixtureFiles', 'runFiles'],
+            function(item) { return data.files[item] || []; }
         )
     );
 
+    files.unshift(
+        {pattern: path.join(appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true}
+    );
+
     files = setDefaults(files);
 
     // With nocache=true, Karma always serves the latest files from disk.
@@ -309,7 +313,7 @@ var configure = function(data) {
     setNocache(files, !data.config.coverage);
 
     var filesForCoverage = _.flatten(
-      _.map(
+        _.map(
             ['sourceFiles', 'specFiles'],
             function(item) { return data.files[item]; }
         )
diff --git a/common/static/karma_common.conf.js b/common/static/karma_common.conf.js
index 43e3ac96e8..5fdf9f5a2b 100644
--- a/common/static/karma_common.conf.js
+++ b/common/static/karma_common.conf.js
@@ -9,51 +9,46 @@ var configModule = require(path.join(__dirname, '../../common/static/common/js/k
 
 var files = {
     libraryFiles: [
-    {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
-
-    {pattern: 'js/vendor/jquery.min.js', included: true},
-    {pattern: 'js/vendor/jasmine-imagediff.js', included: true},
-    {pattern: 'js/libs/jasmine-waituntil.js', included: true},
-    {pattern: 'js/libs/jasmine-extensions.js', included: true},
-    {pattern: 'js/vendor/jquery.truncate.js', included: true},
-    {pattern: 'js/vendor/mustache.js', included: true},
-    {pattern: 'common/js/vendor/underscore.js', included: true},
-    {pattern: 'common/js/vendor/underscore.string.js', included: true},
-    {pattern: 'common/js/vendor/backbone.js', included: true},
-    {pattern: 'js/vendor/jquery.timeago.js', included: true},
-    {pattern: 'js/vendor/URI.min.js', included: true},
-    {pattern: 'coffee/src/ajax_prefix.js', included: true},
-    {pattern: 'js/test/add_ajax_prefix.js', included: true},
-    {pattern: 'js/test/i18n.js', included: true},
-    {pattern: 'coffee/src/jquery.immediateDescendents.js', included: true},
-    {pattern: 'js/vendor/jquery.leanModal.js', included: true},
-    {pattern: 'js/vendor/draggabilly.js', included: true},
-    {pattern: 'edx-ui-toolkit/js/utils/global-loader.js', included: true},
-    {pattern: 'edx-pattern-library/js/modernizr-custom.js', included: true},
-    {pattern: 'edx-pattern-library/js/afontgarde.js', included: true},
-    {pattern: 'edx-pattern-library/js/edx-icons.js', included: true}
+        {pattern: 'js/vendor/jquery.min.js', included: true},
+        {pattern: 'js/vendor/jasmine-imagediff.js', included: true},
+        {pattern: 'js/libs/jasmine-waituntil.js', included: true},
+        {pattern: 'js/libs/jasmine-extensions.js', included: true},
+        {pattern: 'js/vendor/jquery.truncate.js', included: true},
+        {pattern: 'js/vendor/mustache.js', included: true},
+        {pattern: 'common/js/vendor/underscore.js', included: true},
+        {pattern: 'common/js/vendor/underscore.string.js', included: true},
+        {pattern: 'common/js/vendor/backbone.js', included: true},
+        {pattern: 'js/vendor/jquery.timeago.js', included: true},
+        {pattern: 'js/vendor/URI.min.js', included: true},
+        {pattern: 'coffee/src/ajax_prefix.js', included: true},
+        {pattern: 'js/test/add_ajax_prefix.js', included: true},
+        {pattern: 'js/test/i18n.js', included: true},
+        {pattern: 'coffee/src/jquery.immediateDescendents.js', included: true},
+        {pattern: 'js/vendor/jquery.leanModal.js', included: true},
+        {pattern: 'js/vendor/draggabilly.js', included: true},
+        {pattern: 'edx-ui-toolkit/js/utils/global-loader.js', included: true},
+        {pattern: 'edx-pattern-library/js/modernizr-custom.js', included: true},
+        {pattern: 'edx-pattern-library/js/afontgarde.js', included: true},
+        {pattern: 'edx-pattern-library/js/edx-icons.js', included: true}
     ],
 
     sourceFiles: [
-    {pattern: 'js/xblock/**/*.js', included: true},
-    {pattern: 'coffee/src/**/*.js', included: true},
-    {pattern: 'js/src/**/*.js', included: true},
-    {pattern: 'js/capa/src/**/*.js', included: true}
+        {pattern: 'js/xblock/**/*.js', included: true},
+        {pattern: 'coffee/src/**/*.js', included: true},
+        {pattern: 'js/src/**/*.js', included: true},
+        {pattern: 'js/capa/src/**/*.js', included: true}
     ],
 
     specFiles: [
-    {pattern: 'coffee/spec/**/*.js', included: true},
-    {pattern: 'js/spec/**/*.js', included: true},
-    {pattern: 'js/capa/spec/**/*.js', included: true}
+        {pattern: 'coffee/spec/**/*.js', included: true},
+        {pattern: 'js/spec/**/*.js', included: true},
+        {pattern: 'js/capa/spec/**/*.js', included: true}
     ],
 
     fixtureFiles: [
-    {pattern: 'js/fixtures/**/*.html', included: false},
-    {pattern: 'js/capa/fixtures/**/*.html', included: false},
-    {pattern: 'common/templates/**/*.underscore', included: false}
-    ],
-
-    runAndConfigFiles: [
+        {pattern: 'js/fixtures/**/*.html'},
+        {pattern: 'js/capa/fixtures/**/*.html'},
+        {pattern: 'common/templates/**/*.underscore'}
     ]
 };
 
diff --git a/common/static/karma_common_requirejs.conf.js b/common/static/karma_common_requirejs.conf.js
index f50e59c975..3bcf77409f 100644
--- a/common/static/karma_common_requirejs.conf.js
+++ b/common/static/karma_common_requirejs.conf.js
@@ -10,43 +10,42 @@ var configModule = require(path.join(__dirname, '../../common/static/common/js/k
 
 var files = {
     libraryFiles: [
-    {pattern: 'js/vendor/jquery.min.js', included: false},
-    {pattern: 'js/vendor/jasmine-imagediff.js', included: false},
-    {pattern: 'js/libs/jasmine-stealth.js', included: false},
-    {pattern: 'js/libs/jasmine-waituntil.js', included: false},
-    {pattern: 'js/libs/jasmine-extensions.js', included: false},
-    {pattern: 'js/vendor/jquery.simulate.js', included: false},
-    {pattern: 'js/vendor/jquery.truncate.js', included: false},
-    {pattern: 'common/js/vendor/underscore.js', included: false},
-    {pattern: 'common/js/vendor/underscore.string.js', included: false},
-    {pattern: 'common/js/vendor/backbone.js', included: false},
-    {pattern: 'js/vendor/backbone.paginator.min.js', included: false},
-    {pattern: 'js/vendor/jquery.timeago.js', included: false},
-    {pattern: 'js/vendor/URI.min.js', included: false},
-    {pattern: 'coffee/src/ajax_prefix.js', included: false},
-    {pattern: 'js/test/add_ajax_prefix.js', included: false},
-    {pattern: 'js/test/i18n.js', included: false},
-    {pattern: 'coffee/src/jquery.immediateDescendents.js', included: false},
-    {pattern: 'js/vendor/requirejs/text.js', included: false},
-    {pattern: 'js/vendor/sinon-1.17.0.js', included: false},
-    {pattern: 'common/js/utils/require-serial.js', included: true}
+        {pattern: 'js/vendor/jquery.min.js'},
+        {pattern: 'js/vendor/jasmine-imagediff.js'},
+        {pattern: 'js/libs/jasmine-stealth.js'},
+        {pattern: 'js/libs/jasmine-waituntil.js'},
+        {pattern: 'js/libs/jasmine-extensions.js'},
+        {pattern: 'js/vendor/jquery.simulate.js'},
+        {pattern: 'js/vendor/jquery.truncate.js'},
+        {pattern: 'common/js/vendor/underscore.js'},
+        {pattern: 'common/js/vendor/underscore.string.js'},
+        {pattern: 'common/js/vendor/backbone.js'},
+        {pattern: 'js/vendor/backbone.paginator.min.js'},
+        {pattern: 'js/vendor/jquery.timeago.js'},
+        {pattern: 'js/vendor/URI.min.js'},
+        {pattern: 'coffee/src/ajax_prefix.js'},
+        {pattern: 'js/test/add_ajax_prefix.js'},
+        {pattern: 'js/test/i18n.js'},
+        {pattern: 'coffee/src/jquery.immediateDescendents.js'},
+        {pattern: 'js/vendor/requirejs/text.js'},
+        {pattern: 'js/vendor/sinon-1.17.0.js'},
+        {pattern: 'common/js/utils/require-serial.js', included: true}
     ],
 
     sourceFiles: [
-    {pattern: 'common/js/**/!(*spec).js', included: false}
+        {pattern: 'common/js/**/!(*spec).js'}
     ],
 
     specFiles: [
-    {pattern: 'common/js/spec/**/*spec.js', included: false}
+        {pattern: 'common/js/spec/**/*spec.js'}
     ],
 
     fixtureFiles: [
-    {pattern: 'common/templates/**/*.*', included: false}
+        {pattern: 'common/templates/**/*.*'}
     ],
 
-    runAndConfigFiles: [
-    {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
-    'common/js/spec/main_requirejs.js'
+    runFiles: [
+        {pattern: 'common/js/spec/main_requirejs.js', included: true}
     ]
 };
 
diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js
index cec0b85250..29ef09f3e0 100644
--- a/lms/static/karma_lms.conf.js
+++ b/lms/static/karma_lms.conf.js
@@ -9,102 +9,95 @@ var configModule = require(path.join(__dirname, '../../common/static/common/js/k
 
 var files = {
     libraryFiles: [
-    {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: false},
-    {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/src/logger.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js', included: false},
-    {pattern: 'js/RequireJS-namespace-undefine.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/requirejs/text.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.simulate.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.timeago.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/flot/jquery.flot.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js', included: false},
-    {
-        pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js',
-        included: false
-    },
-    {
-        pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js',
-        included: false
-    },
-    {pattern: 'xmodule_js/common_static/js/vendor/url.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/xblock/**/*.js', included: false},
-    {pattern: 'xmodule_js/common_static/coffee/src/xblock/**/*.js', included: false},
-    {pattern: 'coffee/src/instructor_dashboard/**/*.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/sinon-1.17.0.js', included: false},
-    {pattern: 'xmodule_js/src/capa/**/*.js', included: false},
-    {pattern: 'xmodule_js/src/video/**/*.js', included: false},
-    {pattern: 'xmodule_js/src/xmodule.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/src/**/*.js', included: false},
-    {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: false},
-    {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js', included: false},
-    {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/date.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/moment.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/moment-with-locales.min.js', included: false},
-    {pattern: 'xmodule_js/common_static/common/js/utils/edx.utils.validate.js', included: false},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.event.drag-2.2.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/slick.core.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/slick.grid.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
-    {pattern: 'common/js/utils/require-serial.js', included: true}
+        {pattern: 'xmodule_js/common_static/js/test/i18n.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js'},
+        {pattern: 'xmodule_js/common_static/js/src/logger.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js'},
+        {pattern: 'js/RequireJS-namespace-undefine.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/text.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.simulate.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.timeago.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/flot/jquery.flot.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/url.min.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js'},
+        {pattern: 'xmodule_js/common_static/js/xblock/**/*.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/xblock/**/*.js'},
+        {pattern: 'coffee/src/instructor_dashboard/**/*.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/sinon-1.17.0.js'},
+        {pattern: 'xmodule_js/src/capa/**/*.js'},
+        {pattern: 'xmodule_js/src/video/**/*.js'},
+        {pattern: 'xmodule_js/src/xmodule.js'},
+        {pattern: 'xmodule_js/common_static/js/src/**/*.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js'},
+        {pattern: 'xmodule_js/common_static/js/test/i18n.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/date.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/moment.min.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/moment-with-locales.min.js'},
+        {pattern: 'xmodule_js/common_static/common/js/utils/edx.utils.validate.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.event.drag-2.2.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/slick.core.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/slick.grid.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
+        {pattern: 'common/js/utils/require-serial.js', included: true}
     ],
 
     sourceFiles: [
-    {pattern: 'js/**/!(*spec).js', included: false},
-    {pattern: 'coffee/src/**/*.js', included: false},
-    {pattern: 'common/js/**/*.js', included: false},
-    {pattern: 'edx-pattern-library/js/**/*.js', included: false},
-    {pattern: 'edx-ui-toolkit/js/**/*.js', included: false},
-    {pattern: 'support/js/**/!(*spec).js', included: false},
-    {pattern: 'teams/js/**/!(*spec).js', included: false},
-    {pattern: 'xmodule_js/common_static/coffee/**/*.js', included: false}
+        {pattern: 'js/**/!(*spec).js'},
+        {pattern: 'coffee/src/**/*.js'},
+        {pattern: 'common/js/**/*.js'},
+        {pattern: 'edx-pattern-library/js/**/*.js'},
+        {pattern: 'edx-ui-toolkit/js/**/*.js'},
+        {pattern: 'support/js/**/!(*spec).js'},
+        {pattern: 'teams/js/**/!(*spec).js'},
+        {pattern: 'xmodule_js/common_static/coffee/**/*.js'}
     ],
 
     specFiles: [
-    {pattern: 'js/spec/**/*spec.js', included: false},
-    {pattern: 'teams/js/spec/**/*spec.js', included: false},
-    {pattern: 'support/js/spec/**/*spec.js', included: false}
+        {pattern: 'js/spec/**/*spec.js'},
+        {pattern: 'teams/js/spec/**/*spec.js'},
+        {pattern: 'support/js/spec/**/*spec.js'}
     ],
 
     fixtureFiles: [
-    {pattern: 'js/fixtures/**/*.html', included: false},
-    {pattern: 'templates/instructor/instructor_dashboard_2/**/*.*', included: false},
-    {pattern: 'templates/dashboard/**/*.*', included: false},
-    {pattern: 'templates/edxnotes/**/*.*', included: false},
-    {pattern: 'templates/fields/**/*.*', included: false},
-    {pattern: 'templates/student_account/**/*.*', included: false},
-    {pattern: 'templates/student_profile/**/*.*', included: false},
-    {pattern: 'templates/verify_student/**/*.*', included: false},
-    {pattern: 'templates/file-upload.underscore', included: false},
-    {pattern: 'templates/components/header/**/*.*', included: false},
-    {pattern: 'templates/components/tabbed/**/*.*', included: false},
-    {pattern: 'templates/components/card/**/*.*', included: false},
-    {pattern: 'templates/financial-assistance/**/*.*', included: false},
-    {pattern: 'templates/search/**/*.*', included: false},
-    {pattern: 'templates/discovery/**/*.*', included: false},
-    {pattern: 'common/templates/**/*.*', included: false},
-    {pattern: 'teams/templates/**/*.*', included: false},
-    {pattern: 'support/templates/**/*.*', included: false},
-    {pattern: 'templates/bookmarks/**/*.*', included: false},
-    {pattern: 'templates/learner_dashboard/**/*.*', included: false},
-    {pattern: 'templates/ccx/**/*.*', included: false},
-    {pattern: 'templates/commerce/receipt.underscore', included: false},
-    {pattern: 'templates/api_admin/**/*.*', included: false}
+        {pattern: 'js/fixtures/**/*.html'},
+        {pattern: 'templates/instructor/instructor_dashboard_2/**/*.*'},
+        {pattern: 'templates/dashboard/**/*.*'},
+        {pattern: 'templates/edxnotes/**/*.*'},
+        {pattern: 'templates/fields/**/*.*'},
+        {pattern: 'templates/student_account/**/*.*'},
+        {pattern: 'templates/student_profile/**/*.*'},
+        {pattern: 'templates/verify_student/**/*.*'},
+        {pattern: 'templates/file-upload.underscore'},
+        {pattern: 'templates/components/header/**/*.*'},
+        {pattern: 'templates/components/tabbed/**/*.*'},
+        {pattern: 'templates/components/card/**/*.*'},
+        {pattern: 'templates/financial-assistance/**/*.*'},
+        {pattern: 'templates/search/**/*.*'},
+        {pattern: 'templates/discovery/**/*.*'},
+        {pattern: 'common/templates/**/*.*'},
+        {pattern: 'teams/templates/**/*.*'},
+        {pattern: 'support/templates/**/*.*'},
+        {pattern: 'templates/bookmarks/**/*.*'},
+        {pattern: 'templates/learner_dashboard/**/*.*'},
+        {pattern: 'templates/ccx/**/*.*'},
+        {pattern: 'templates/commerce/receipt.underscore'},
+        {pattern: 'templates/api_admin/**/*.*', included: false}
     ],
 
-    runAndConfigFiles: [
-    {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
-    {pattern: 'js/spec/main.js', included: true}
+    runFiles: [
+        {pattern: 'js/spec/main.js', included: true}
     ]
 };
 
diff --git a/lms/static/karma_lms_coffee.conf.js b/lms/static/karma_lms_coffee.conf.js
index 69b7ba2f72..d6066213f7 100644
--- a/lms/static/karma_lms_coffee.conf.js
+++ b/lms/static/karma_lms_coffee.conf.js
@@ -10,52 +10,47 @@ var configModule = require(path.join(__dirname, '../../common/static/common/js/k
 
 var files = {
     libraryFiles: [
-    {pattern: path.join(configModule.appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true},
-
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: true},
-    {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/src/logger.js', included: true},
-    {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js', included: true},
-    {pattern: 'js/spec/main_requirejs_coffee.js', included: true},
-    {pattern: 'js/RequireJS-namespace-undefine.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/flot/jquery.flot.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/moment.min.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/moment-with-locales.min.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js', included: true},
-    {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/xblock/*.js', included: true},
-    {pattern: 'xmodule_js/common_static/coffee/src/xblock/*.js', included: true},
-    {pattern: 'moment_requirejs.js', included: true},
-    {pattern: 'xmodule_js/src/capa/*.js', included: true},
-    {pattern: 'xmodule_js/src/video/*.js', included: true},
-    {pattern: 'xmodule_js/src/xmodule.js', included: true},
-    {pattern: 'xmodule_js/common_static/js/vendor/draggabilly.js', included: false},
-    {pattern: 'xmodule_js/common_static/edx-ui-toolkit/js/utils/global-loader.js', included: true},
-    {pattern: 'xmodule_js/common_static/edx-pattern-library/js/modernizr-custom.js', included: false},
-    {pattern: 'xmodule_js/common_static/edx-pattern-library/js/afontgarde.js', included: false},
-    {pattern: 'xmodule_js/common_static/edx-pattern-library/js/edx-icons.js', included: false}
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: true},
+        {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/src/logger.js', included: true},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js', included: true},
+        {pattern: 'js/spec/main_requirejs_coffee.js', included: true},
+        {pattern: 'js/RequireJS-namespace-undefine.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/flot/jquery.flot.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/moment.min.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/moment-with-locales.min.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js', included: true},
+        {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/xblock/*.js', included: true},
+        {pattern: 'xmodule_js/common_static/coffee/src/xblock/*.js', included: true},
+        {pattern: 'moment_requirejs.js', included: true},
+        {pattern: 'xmodule_js/src/capa/*.js', included: true},
+        {pattern: 'xmodule_js/src/video/*.js', included: true},
+        {pattern: 'xmodule_js/src/xmodule.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/draggabilly.js'},
+        {pattern: 'xmodule_js/common_static/edx-ui-toolkit/js/utils/global-loader.js', included: true},
+        {pattern: 'xmodule_js/common_static/edx-pattern-library/js/modernizr-custom.js'},
+        {pattern: 'xmodule_js/common_static/edx-pattern-library/js/afontgarde.js'},
+        {pattern: 'xmodule_js/common_static/edx-pattern-library/js/edx-icons.js'}
     ],
 
     sourceFiles: [
-    {pattern: 'coffee/src/**/*.js', included: true}
+        {pattern: 'coffee/src/**/*.js', included: true}
     ],
 
     specFiles: [
-    {pattern: 'coffee/spec/**/*.js', included: true}
+        {pattern: 'coffee/spec/**/*.js', included: true}
     ],
 
     fixtureFiles: [
-    {pattern: 'coffee/fixtures/**/*.*', included: true}
-    ],
-
-    runAndConfigFiles: [
+        {pattern: 'coffee/fixtures/**/*.*', included: true}
     ]
 };
 

From 15acec20547f3b157bd8de67793fe8913280989d Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Tue, 3 May 2016 23:56:24 +0500
Subject: [PATCH 05/11] Simplify paths patterns in karma config files.

Files which are loaded via RequireJs do not need to be individually
declared in karma config files. If we give karma directories,
it will serve all the files in them.
---
 cms/static/karma_cms.conf.js                  | 68 ++++-----------
 cms/static/karma_cms_squire.conf.js           | 61 ++++---------
 .../xmodule/xmodule/js/karma_xmodule.conf.js  | 65 +++++++-------
 common/static/common/js/karma.common.conf.js  | 10 ++-
 common/static/karma_common.conf.js            | 32 ++++---
 common/static/karma_common_requirejs.conf.js  | 33 +++----
 lms/static/js/spec/main_requirejs_coffee.js   |  6 +-
 lms/static/karma_lms.conf.js                  | 85 +++++--------------
 lms/static/karma_lms_coffee.conf.js           | 40 +++++----
 lms/static/moment_requirejs.js                | 15 ----
 10 files changed, 150 insertions(+), 265 deletions(-)
 delete mode 100644 lms/static/moment_requirejs.js

diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js
index 6e4a645a5c..69fb07ab26 100644
--- a/cms/static/karma_cms.conf.js
+++ b/cms/static/karma_cms.conf.js
@@ -8,74 +8,38 @@ var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
 var files = {
+    libraryFilesToInclude: [
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true}
+    ],
+
     libraryFiles: [
-        {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js'},
-        {pattern: 'xmodule_js/common_static/js/src/utility.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.simulate.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/backbone-associations-min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/backbone-relational.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.leanModal.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.ajaxQueue.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.form.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/sinon-1.17.0.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/Squire.js'},
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-stealth.js'},
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js'},
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/**/*.js'},
-        {pattern: 'xmodule_js/src/xmodule.js'},
-        {pattern: 'xmodule_js/common_static/js/test/i18n.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/draggabilly.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/date.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/domReady.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js'},
-        {pattern: 'xmodule_js/common_static/js/xblock/**/*.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/xblock/**/*.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-process.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-validate.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/mock-ajax.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/text.js'},
-        {pattern: 'edx-ui-toolkit/js/utils/global-loader.js'},
-        {pattern: 'edx-pattern-library/js/modernizr-custom.js'},
-        {pattern: 'edx-pattern-library/js/afontgarde.js'},
-        {pattern: 'edx-pattern-library/js/edx-icons.js'},
         {pattern: 'edx-pattern-library/js/**/*.js'},
         {pattern: 'edx-ui-toolkit/js/**/*.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/**/*.js'},
+        {pattern: 'xmodule_js/common_static/js/**/*.js'},
+        {pattern: 'xmodule_js/src/xmodule.js'},
 
-        {pattern: 'common/js/utils/require-serial.js', included: true}
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-stealth.js'},
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js'}
     ],
 
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
-        {pattern: 'js/**/!(*spec).js'},
-        {pattern: 'common/js/**/!(*spec).js'}
+        {pattern: 'common/js/**/!(*spec).js'},
+        {pattern: 'js/**/!(*spec).js'}
     ],
 
     specFiles: [
         {pattern: 'coffee/spec/**/*spec.js'},
-        {pattern: 'js/spec/**/*spec.js'},
-        {pattern: 'js/certificates/spec/**/*spec.js'}
+        {pattern: 'js/certificates/spec/**/*spec.js'},
+        {pattern: 'js/spec/**/*spec.js'}
     ],
 
     fixtureFiles: [
         {pattern: 'coffee/fixtures/**/*.underscore'},
-        {pattern: 'templates/**/*.underscore'},
-        {pattern: 'common/templates/**/*.underscore'}
+        {pattern: 'common/templates/**/*.underscore'},
+        {pattern: 'templates/**/*.underscore'}
     ],
 
     runFiles: [
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index e72bdf2025..568660117f 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -8,61 +8,34 @@ var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
 var files = {
+    libraryFilesToInclude: [
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true}
+    ],
+
     libraryFiles: [
-        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js'},
-        {pattern: 'xmodule_js/common_static/js/src/utility.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/backbone-associations-min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.leanModal.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.form.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/sinon-1.17.0.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/Squire.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/domReady.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js'},
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
-        {pattern: 'xmodule_js/src/xmodule.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js'},
-        {pattern: 'xmodule_js/common_static/js/test/i18n.js'},
-        {pattern: 'xmodule_js/common_static/js/xblock/**/*.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/xblock/**/*.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-process.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload-validate.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/text.js'},
-        {pattern: 'common/js/utils/require-serial.js', included: true}
+        {pattern: 'edx-pattern-library/js/**/*.js'},
+        {pattern: 'edx-ui-toolkit/js/**/*.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/**/*.js'},
+        {pattern: 'xmodule_js/common_static/js/**/*.js'},
+        {pattern: 'xmodule_js/src/**/*.js'},
     ],
 
     sourceFiles: [
-        {pattern: 'coffee/src/**/*.js'},
-        {pattern: 'js/collections/**/*.js'},
-        {pattern: 'js/models/**/*.js'},
-        {pattern: 'js/utils/**/*.js'},
-        {pattern: 'js/views/**/*.js'},
-        {pattern: 'common/js/**/*.js'}
+        {pattern: 'coffee/src/**/!(*spec).js'},
+        {pattern: 'common/js/**/!(*spec).js'},
+        {pattern: 'js/**/!(*spec).js'}
     ],
 
     specFiles: [
-        {pattern: 'coffee/spec/**/*.js'},
-        {pattern: 'js/spec/**/*.js'}
+        {pattern: 'coffee/spec/**/*spec.js'},
+        {pattern: 'js/spec/**/*spec.js'}
     ],
 
     fixtureFiles: [
         {pattern: 'coffee/fixtures/**/*.*'},
-        {pattern: 'templates/**/*.*'},
-        {pattern: 'common/templates/**/*.*'}
+        {pattern: 'common/templates/**/*.*'},
+        {pattern: 'templates/**/*.*'}
     ],
 
     runFiles: [
diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
index ad3ea0dd19..cf010e0b9c 100644
--- a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
+++ b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
@@ -9,49 +9,52 @@ var path = require('path');
 var configModule = require(path.join(__dirname, 'common_static/common/js/karma.common.conf.js'));
 
 var files = {
-    libraryFiles: [
-        {pattern: 'common_static/js/vendor/jquery.min.js', included: true},
-        {pattern: 'common_static/js/test/i18n.js', included: true},
+    libraryFilesToInclude: [
+        {pattern: 'common_static/js/vendor/requirejs/require.js', included: true},
+        {pattern: 'RequireJS-namespace-undefine.js', included: true},
+        {pattern: 'spec/main_requirejs.js', included: true},
+
         {pattern: 'common_static/coffee/src/ajax_prefix.js', included: true},
+        {pattern: 'common_static/common/js/vendor/underscore.js', included: true},
+        {pattern: 'common_static/common/js/vendor/backbone.js', included: true},
+        {pattern: 'common_static/edx-ui-toolkit/js/utils/global-loader.js', included: true},
+        {pattern: 'common_static/js/vendor/CodeMirror/codemirror.js', included: true},
+        {pattern: 'common_static/js/vendor/draggabilly.js'},
+        {pattern: 'common_static/js/vendor/jquery.min.js', included: true},
+        {pattern: 'common_static/js/vendor/jquery.cookie.js', included: true},
+        {pattern: 'common_static/js/vendor/jquery.leanModal.js', included: true},
+        {pattern: 'common_static/js/vendor/jquery.timeago.js', included: true},
+        {pattern: 'common_static/js/vendor/jquery-ui.min.js', included: true},
+        {pattern: 'common_static/js/vendor/jquery.ui.draggable.js', included: true},
+        {pattern: 'common_static/js/vendor/json2.js', included: true},
+        {pattern: 'common_static/js/vendor/moment.min.js', included: true},
+        {pattern: 'common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js', included: true},
+        {pattern: 'common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min.js', included: true},
+        {pattern: 'common_static/js/src/accessibility_tools.js', included: true},
         {pattern: 'common_static/js/src/logger.js', included: true},
+        {pattern: 'common_static/js/src/utility.js', included: true},
+        {pattern: 'common_static/js/test/add_ajax_prefix.js', included: true},
+        {pattern: 'common_static/js/test/i18n.js', included: true},
+        {pattern: 'public/js/split_test_staff.js', included: true},
+        {pattern: 'src/word_cloud/d3.min.js', included: true},
+
         {pattern: 'common_static/js/vendor/jasmine-imagediff.js', included: true},
         {pattern: 'common_static/js/libs/jasmine-waituntil.js', included: true},
         {pattern: 'common_static/js/libs/jasmine-extensions.js', included: true},
-        {pattern: 'common_static/js/vendor/requirejs/require.js', included: true},
-        {pattern: 'RequireJS-namespace-undefine.js', included: true},
-        {pattern: 'common_static/js/vendor/jquery-ui.min.js', included: true},
-        {pattern: 'common_static/js/vendor/jquery.ui.draggable.js', included: true},
-        {pattern: 'common_static/js/vendor/jquery.cookie.js', included: true},
-        {pattern: 'common_static/js/vendor/json2.js', included: true},
-        {pattern: 'common_static/common/js/vendor/underscore.js', included: true},
-        {pattern: 'common_static/common/js/vendor/backbone.js', included: true},
-        {pattern: 'common_static/js/vendor/jquery.leanModal.js', included: true},
-        {pattern: 'common_static/js/vendor/CodeMirror/codemirror.js', included: true},
-        {pattern: 'common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js', included: true},
-        {pattern: 'common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min.js', included: true},
-        {pattern: 'common_static/js/vendor/jquery.timeago.js', included: true},
-        {pattern: 'common_static/js/vendor/sinon-1.17.0.js', included: true},
-        {pattern: 'common_static/js/test/add_ajax_prefix.js', included: true},
-        {pattern: 'common_static/js/src/utility.js', included: true},
-        {pattern: 'public/js/split_test_staff.js', included: true},
-        {pattern: 'common_static/js/src/accessibility_tools.js', included: true},
-        {pattern: 'common_static/js/vendor/moment.min.js', included: true},
-        {pattern: 'spec/main_requirejs.js', included: true},
-        {pattern: 'src/word_cloud/d3.min.js', included: true},
-        {pattern: 'common_static/js/vendor/draggabilly.js'},
-        {pattern: 'common_static/edx-ui-toolkit/js/utils/global-loader.js', included: true},
-        {pattern: 'common_static/edx-pattern-library/js/modernizr-custom.js'},
-        {pattern: 'common_static/edx-pattern-library/js/afontgarde.js'},
-        {pattern: 'common_static/edx-pattern-library/js/edx-icons.js'}
+        {pattern: 'common_static/js/vendor/sinon-1.17.0.js', included: true}
+    ],
+
+    libraryFiles: [
+        {pattern: 'common_static/edx-pattern-library/js/**/*.js'}
     ],
 
     sourceFiles: [
-        {pattern: 'src/xmodule.js', included: true, ignoreCoverage: true},
+        {pattern: 'src/xmodule.js', included: true, ignoreCoverage: true}, // To prevent getting instrumented twice.
         {pattern: 'src/**/*.js', included: true}
     ],
 
     specFiles: [
-        {pattern: 'spec/helper.js', included: true, ignoreCoverage: true},
+        {pattern: 'spec/helper.js', included: true, ignoreCoverage: true}, // Helper which depends on source files.
         {pattern: 'spec/**/*.js', included: true}
     ],
 
diff --git a/common/static/common/js/karma.common.conf.js b/common/static/common/js/karma.common.conf.js
index a279652e5b..16e67006de 100644
--- a/common/static/common/js/karma.common.conf.js
+++ b/common/static/common/js/karma.common.conf.js
@@ -178,7 +178,6 @@ var setDefaults = function (files) {
 };
 
 var getBaseConfig = function (config, useRequireJs) {
-    useRequireJs = useRequireJs === undefined ? true : useRequireJs;
 
     var getFrameworkFiles = function () {
         var files = [
@@ -292,11 +291,12 @@ var getBaseConfig = function (config, useRequireJs) {
 };
 
 var configure = function(data) {
-    var baseConfig = getBaseConfig(data.config, data.useRequireJs);
+    var useRequireJs = data.useRequireJs === undefined ? true : useRequireJs,
+        baseConfig = getBaseConfig(data.config, useRequireJs);
 
     var files = _.flatten(
         _.map(
-            ['libraryFiles', 'sourceFiles', 'specFiles', 'fixtureFiles', 'runFiles'],
+            ['libraryFilesToInclude', 'libraryFiles', 'sourceFiles', 'specFiles', 'fixtureFiles', 'runFiles'],
             function(item) { return data.files[item] || []; }
         )
     );
@@ -305,6 +305,10 @@ var configure = function(data) {
         {pattern: path.join(appRoot, 'common/static/common/js/jasmine.common.conf.js'), included: true}
     );
 
+    if (useRequireJs) {
+      files.unshift({pattern: 'common/js/utils/require-serial.js', included: true});
+    }
+
     files = setDefaults(files);
 
     // With nocache=true, Karma always serves the latest files from disk.
diff --git a/common/static/karma_common.conf.js b/common/static/karma_common.conf.js
index 5fdf9f5a2b..bf267c07e1 100644
--- a/common/static/karma_common.conf.js
+++ b/common/static/karma_common.conf.js
@@ -8,28 +8,34 @@ var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
 var files = {
-    libraryFiles: [
+    libraryFilesToInclude: [
+        {pattern: 'coffee/src/ajax_prefix.js', included: true},
+        {pattern: 'js/vendor/draggabilly.js', included: true},
         {pattern: 'js/vendor/jquery.min.js', included: true},
-        {pattern: 'js/vendor/jasmine-imagediff.js', included: true},
-        {pattern: 'js/libs/jasmine-waituntil.js', included: true},
-        {pattern: 'js/libs/jasmine-extensions.js', included: true},
+        {pattern: 'coffee/src/jquery.immediateDescendents.js', included: true},
+        {pattern: 'js/vendor/jquery.leanModal.js', included: true},
+        {pattern: 'js/vendor/jquery.timeago.js', included: true},
         {pattern: 'js/vendor/jquery.truncate.js', included: true},
         {pattern: 'js/vendor/mustache.js', included: true},
+        {pattern: 'js/vendor/URI.min.js', included: true},
+        {pattern: 'js/test/add_ajax_prefix.js', included: true},
+        {pattern: 'js/test/i18n.js', included: true},
+
         {pattern: 'common/js/vendor/underscore.js', included: true},
         {pattern: 'common/js/vendor/underscore.string.js', included: true},
         {pattern: 'common/js/vendor/backbone.js', included: true},
-        {pattern: 'js/vendor/jquery.timeago.js', included: true},
-        {pattern: 'js/vendor/URI.min.js', included: true},
-        {pattern: 'coffee/src/ajax_prefix.js', included: true},
-        {pattern: 'js/test/add_ajax_prefix.js', included: true},
-        {pattern: 'js/test/i18n.js', included: true},
-        {pattern: 'coffee/src/jquery.immediateDescendents.js', included: true},
-        {pattern: 'js/vendor/jquery.leanModal.js', included: true},
-        {pattern: 'js/vendor/draggabilly.js', included: true},
+
         {pattern: 'edx-ui-toolkit/js/utils/global-loader.js', included: true},
         {pattern: 'edx-pattern-library/js/modernizr-custom.js', included: true},
         {pattern: 'edx-pattern-library/js/afontgarde.js', included: true},
-        {pattern: 'edx-pattern-library/js/edx-icons.js', included: true}
+        {pattern: 'edx-pattern-library/js/edx-icons.js', included: true},
+
+        {pattern: 'js/vendor/jasmine-imagediff.js', included: true},
+        {pattern: 'js/libs/jasmine-waituntil.js', included: true},
+        {pattern: 'js/libs/jasmine-extensions.js', included: true}
+    ],
+
+    libraryFiles: [
     ],
 
     sourceFiles: [
diff --git a/common/static/karma_common_requirejs.conf.js b/common/static/karma_common_requirejs.conf.js
index 3bcf77409f..d0a5e641a7 100644
--- a/common/static/karma_common_requirejs.conf.js
+++ b/common/static/karma_common_requirejs.conf.js
@@ -9,31 +9,22 @@ var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
 var files = {
+    libraryFilesToInclude: [
+        {pattern: 'js/libs/jasmine-extensions.js', included: true}
+    ],
+
     libraryFiles: [
-        {pattern: 'js/vendor/jquery.min.js'},
-        {pattern: 'js/vendor/jasmine-imagediff.js'},
-        {pattern: 'js/libs/jasmine-stealth.js'},
-        {pattern: 'js/libs/jasmine-waituntil.js'},
-        {pattern: 'js/libs/jasmine-extensions.js'},
-        {pattern: 'js/vendor/jquery.simulate.js'},
-        {pattern: 'js/vendor/jquery.truncate.js'},
-        {pattern: 'common/js/vendor/underscore.js'},
-        {pattern: 'common/js/vendor/underscore.string.js'},
-        {pattern: 'common/js/vendor/backbone.js'},
-        {pattern: 'js/vendor/backbone.paginator.min.js'},
-        {pattern: 'js/vendor/jquery.timeago.js'},
-        {pattern: 'js/vendor/URI.min.js'},
-        {pattern: 'coffee/src/ajax_prefix.js'},
-        {pattern: 'js/test/add_ajax_prefix.js'},
-        {pattern: 'js/test/i18n.js'},
-        {pattern: 'coffee/src/jquery.immediateDescendents.js'},
-        {pattern: 'js/vendor/requirejs/text.js'},
-        {pattern: 'js/vendor/sinon-1.17.0.js'},
-        {pattern: 'common/js/utils/require-serial.js', included: true}
+        {pattern: 'coffee/src/**/*.js'},
+        {pattern: 'common/js/spec_helpers/**/*.js'},
+        {pattern: 'common/js/vendor/**/*.js'},
+        {pattern: 'js/libs/**/*.js'},
+        {pattern: 'js/test/**/*.js'},
+        {pattern: 'js/vendor/**/*.js'}
     ],
 
     sourceFiles: [
-        {pattern: 'common/js/**/!(*spec).js'}
+        {pattern: 'common/js/components/**/!(*spec).js'},
+        {pattern: 'common/js/utils/**/!(*spec).js'}
     ],
 
     specFiles: [
diff --git a/lms/static/js/spec/main_requirejs_coffee.js b/lms/static/js/spec/main_requirejs_coffee.js
index 0597f1e952..541d4f763d 100644
--- a/lms/static/js/spec/main_requirejs_coffee.js
+++ b/lms/static/js/spec/main_requirejs_coffee.js
@@ -4,9 +4,9 @@
         baseUrl: '/base/',
         paths: {
             "moment": "xmodule_js/common_static/js/vendor/moment.min",
-            "modernizr": "xmodule_js/common_static/edx-pattern-library/js/modernizr-custom",
-            "afontgarde": "xmodule_js/common_static/edx-pattern-library/js/afontgarde",
-            "edxicons": "xmodule_js/common_static/edx-pattern-library/js/edx-icons",
+            "modernizr": "edx-pattern-library/js/modernizr-custom",
+            "afontgarde": "edx-pattern-library/js/afontgarde",
+            "edxicons": "edx-pattern-library/js/edx-icons",
             "draggabilly": "xmodule_js/common_static/js/vendor/draggabilly"
         },
         "moment": {
diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js
index 29ef09f3e0..609b4b9ac6 100644
--- a/lms/static/karma_lms.conf.js
+++ b/lms/static/karma_lms.conf.js
@@ -8,92 +8,47 @@ var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
 var files = {
-    libraryFiles: [
-        {pattern: 'xmodule_js/common_static/js/test/i18n.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js'},
-        {pattern: 'xmodule_js/common_static/js/src/logger.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js'},
-        {pattern: 'js/RequireJS-namespace-undefine.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/requirejs/text.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.simulate.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.timeago.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/flot/jquery.flot.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.fileupload.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/url.min.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js'},
-        {pattern: 'xmodule_js/common_static/js/xblock/**/*.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/xblock/**/*.js'},
-        {pattern: 'coffee/src/instructor_dashboard/**/*.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/sinon-1.17.0.js'},
-        {pattern: 'xmodule_js/src/capa/**/*.js'},
-        {pattern: 'xmodule_js/src/video/**/*.js'},
-        {pattern: 'xmodule_js/src/xmodule.js'},
-        {pattern: 'xmodule_js/common_static/js/src/**/*.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js'},
-        {pattern: 'xmodule_js/common_static/js/test/i18n.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/date.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/moment.min.js'},
-        {pattern: 'xmodule_js/common_static/js/vendor/moment-with-locales.min.js'},
-        {pattern: 'xmodule_js/common_static/common/js/utils/edx.utils.validate.js'},
+    libraryFilesToInclude: [
         {pattern: 'xmodule_js/common_static/js/vendor/jquery.event.drag-2.2.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/slick.core.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/slick.grid.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js', included: true},
         {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
-        {pattern: 'common/js/utils/require-serial.js', included: true}
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js', included: true}
     ],
 
-    sourceFiles: [
-        {pattern: 'js/**/!(*spec).js'},
-        {pattern: 'coffee/src/**/*.js'},
+    libraryFiles: [
         {pattern: 'common/js/**/*.js'},
         {pattern: 'edx-pattern-library/js/**/*.js'},
         {pattern: 'edx-ui-toolkit/js/**/*.js'},
+        {pattern: 'js/RequireJS-namespace-undefine.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
+        {pattern: 'xmodule_js/common_static/common/js/**/*.js'},
+        {pattern: 'xmodule_js/common_static/js/**/*.js'},
+        {pattern: 'xmodule_js/src/capa/*.js'},
+        {pattern: 'xmodule_js/src/video/*.js'},
+        {pattern: 'xmodule_js/src/xmodule.js'}
+    ],
+
+    sourceFiles: [
+        {pattern: 'coffee/src/**/!(*spec).js'},
+        {pattern: 'js/**/!(*spec).js'},
         {pattern: 'support/js/**/!(*spec).js'},
         {pattern: 'teams/js/**/!(*spec).js'},
-        {pattern: 'xmodule_js/common_static/coffee/**/*.js'}
+        {pattern: 'xmodule_js/common_static/coffee/**/!(*spec).js'},
     ],
 
     specFiles: [
         {pattern: 'js/spec/**/*spec.js'},
-        {pattern: 'teams/js/spec/**/*spec.js'},
-        {pattern: 'support/js/spec/**/*spec.js'}
+        {pattern: 'support/js/spec/**/*spec.js'},
+        {pattern: 'teams/js/spec/**/*spec.js'}
     ],
 
     fixtureFiles: [
         {pattern: 'js/fixtures/**/*.html'},
-        {pattern: 'templates/instructor/instructor_dashboard_2/**/*.*'},
-        {pattern: 'templates/dashboard/**/*.*'},
-        {pattern: 'templates/edxnotes/**/*.*'},
-        {pattern: 'templates/fields/**/*.*'},
-        {pattern: 'templates/student_account/**/*.*'},
-        {pattern: 'templates/student_profile/**/*.*'},
-        {pattern: 'templates/verify_student/**/*.*'},
-        {pattern: 'templates/file-upload.underscore'},
-        {pattern: 'templates/components/header/**/*.*'},
-        {pattern: 'templates/components/tabbed/**/*.*'},
-        {pattern: 'templates/components/card/**/*.*'},
-        {pattern: 'templates/financial-assistance/**/*.*'},
-        {pattern: 'templates/search/**/*.*'},
-        {pattern: 'templates/discovery/**/*.*'},
         {pattern: 'common/templates/**/*.*'},
-        {pattern: 'teams/templates/**/*.*'},
         {pattern: 'support/templates/**/*.*'},
-        {pattern: 'templates/bookmarks/**/*.*'},
-        {pattern: 'templates/learner_dashboard/**/*.*'},
-        {pattern: 'templates/ccx/**/*.*'},
-        {pattern: 'templates/commerce/receipt.underscore'},
-        {pattern: 'templates/api_admin/**/*.*', included: false}
+        {pattern: 'teams/templates/**/*.*'},
+        {pattern: 'templates/**/*.*'}
     ],
 
     runFiles: [
diff --git a/lms/static/karma_lms_coffee.conf.js b/lms/static/karma_lms_coffee.conf.js
index d6066213f7..f488b35664 100644
--- a/lms/static/karma_lms_coffee.conf.js
+++ b/lms/static/karma_lms_coffee.conf.js
@@ -9,40 +9,44 @@ var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
 var files = {
-    libraryFiles: [
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: true},
-        {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/src/logger.js', included: true},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
+    libraryFilesToInclude: [
         {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js', included: true},
         {pattern: 'js/spec/main_requirejs_coffee.js', included: true},
+
         {pattern: 'js/RequireJS-namespace-undefine.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js', included: true},
+        {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: true},
+        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: true},
+        {pattern: 'xmodule_js/common_static/edx-ui-toolkit/js/utils/global-loader.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/src/logger.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery.min.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/flot/jquery.flot.js', included: true},
+        {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/jquery-ui.min.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/moment.min.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/moment-with-locales.min.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/URI.min.js', included: true},
-        {pattern: 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents.js', included: true},
+
         {pattern: 'xmodule_js/common_static/js/xblock/*.js', included: true},
         {pattern: 'xmodule_js/common_static/coffee/src/xblock/*.js', included: true},
-        {pattern: 'moment_requirejs.js', included: true},
         {pattern: 'xmodule_js/src/capa/*.js', included: true},
         {pattern: 'xmodule_js/src/video/*.js', included: true},
         {pattern: 'xmodule_js/src/xmodule.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/vendor/draggabilly.js'},
-        {pattern: 'xmodule_js/common_static/edx-ui-toolkit/js/utils/global-loader.js', included: true},
-        {pattern: 'xmodule_js/common_static/edx-pattern-library/js/modernizr-custom.js'},
-        {pattern: 'xmodule_js/common_static/edx-pattern-library/js/afontgarde.js'},
-        {pattern: 'xmodule_js/common_static/edx-pattern-library/js/edx-icons.js'}
+
+        {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true}
+    ],
+
+    libraryFiles: [
+        {pattern: 'edx-pattern-library/js/**/*.js'},
+        {pattern: 'edx-ui-toolkit/js/**/*.js'},
+        {pattern: 'xmodule_js/common_static/js/vendor/**/*.js'}
     ],
 
     sourceFiles: [
-        {pattern: 'coffee/src/**/*.js', included: true}
+        {pattern: 'coffee/src/**/*.js', included: true},
     ],
 
     specFiles: [
diff --git a/lms/static/moment_requirejs.js b/lms/static/moment_requirejs.js
deleted file mode 100644
index 745cd0b5c1..0000000000
--- a/lms/static/moment_requirejs.js
+++ /dev/null
@@ -1,15 +0,0 @@
-(function(requirejs) {
-    'use strict';
-
-    requirejs.config({
-        paths: {
-            "moment": "/base/xmodule_js/common_static/js/vendor/moment.min"
-        },
-        shim:{
-            "moment": {
-                exports: "moment"
-            }
-        }
-    });
-
-}).call(this, RequireJS.requirejs);

From 84412ef8ead76482b281861379b44a3ca7b45c72 Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Wed, 4 May 2016 16:50:19 +0500
Subject: [PATCH 06/11] Exclude translation files from coverage tracking.

---
 cms/static/karma_cms.conf.js        | 2 +-
 cms/static/karma_cms_squire.conf.js | 2 +-
 lms/static/karma_lms.conf.js        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js
index 69fb07ab26..076221ac8f 100644
--- a/cms/static/karma_cms.conf.js
+++ b/cms/static/karma_cms.conf.js
@@ -27,7 +27,7 @@ var files = {
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
         {pattern: 'common/js/**/!(*spec).js'},
-        {pattern: 'js/**/!(*spec).js'}
+        {pattern: 'js/**/!(*spec|djangojs).js'}
     ],
 
     specFiles: [
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index 568660117f..097e80aa11 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -24,7 +24,7 @@ var files = {
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
         {pattern: 'common/js/**/!(*spec).js'},
-        {pattern: 'js/**/!(*spec).js'}
+        {pattern: 'js/**/!(*spec|djangojs).js'}
     ],
 
     specFiles: [
diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js
index 609b4b9ac6..c205595e61 100644
--- a/lms/static/karma_lms.conf.js
+++ b/lms/static/karma_lms.conf.js
@@ -31,7 +31,7 @@ var files = {
 
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
-        {pattern: 'js/**/!(*spec).js'},
+        {pattern: 'js/**/!(*spec|djangojs).js'},
         {pattern: 'support/js/**/!(*spec).js'},
         {pattern: 'teams/js/**/!(*spec).js'},
         {pattern: 'xmodule_js/common_static/coffee/**/!(*spec).js'},

From 2839a42e0c9aa8014c7616d3997446ba666f8175 Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Wed, 4 May 2016 19:50:54 +0500
Subject: [PATCH 07/11] Moved jasmine addons to common/js/spec_helpers.

---
 cms/static/coffee/spec/main.coffee            | 17 ++++++++++----
 cms/static/coffee/spec/main_spec.coffee       |  3 +--
 cms/static/coffee/spec/main_squire.coffee     | 17 ++++++++++----
 .../coffee/spec/views/textbook_spec.coffee    |  2 +-
 .../js/spec/views/group_configuration_spec.js |  2 +-
 cms/static/karma_cms.conf.js                  |  7 ------
 cms/static/karma_cms_squire.conf.js           |  4 ----
 .../xmodule/xmodule/js/karma_xmodule.conf.js  |  4 ++--
 .../js/spec/components/feedback_spec.js       |  2 +-
 .../js/spec/components/view_utils_spec.js     |  2 +-
 .../static/common/js/spec/main_requirejs.js   | 23 +++++++++++--------
 .../js/spec_helpers}/jasmine-extensions.js    |  0
 .../js/spec_helpers}/jasmine-stealth.js       |  0
 .../js/spec_helpers}/jasmine-waituntil.js     |  0
 common/static/karma_common.conf.js            |  4 ++--
 common/static/karma_common_requirejs.conf.js  |  4 ----
 lms/static/js/spec/main.js                    | 22 ++++++++++--------
 lms/static/karma_lms.conf.js                  |  2 --
 lms/static/karma_lms_coffee.conf.js           |  2 +-
 19 files changed, 59 insertions(+), 58 deletions(-)
 rename common/static/{js/libs => common/js/spec_helpers}/jasmine-extensions.js (100%)
 rename common/static/{js/libs => common/js/spec_helpers}/jasmine-stealth.js (100%)
 rename common/static/{js/libs => common/js/spec_helpers}/jasmine-waituntil.js (100%)

diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee
index c5d1df72b3..f42b2f74f5 100644
--- a/cms/static/coffee/spec/main.coffee
+++ b/cms/static/coffee/spec/main.coffee
@@ -44,8 +44,6 @@ requirejs.config({
         "sinon": "xmodule_js/common_static/js/vendor/sinon-1.17.0",
         "squire": "xmodule_js/common_static/js/vendor/Squire",
         "jasmine-imagediff": "xmodule_js/common_static/js/vendor/jasmine-imagediff",
-        "jasmine-stealth": "xmodule_js/common_static/js/libs/jasmine-stealth",
-        "jasmine-waituntil": "xmodule_js/common_static/js/libs/jasmine-waituntil",
         "draggabilly": "xmodule_js/common_static/js/vendor/draggabilly",
         "domReady": "xmodule_js/common_static/js/vendor/domReady",
         "URI": "xmodule_js/common_static/js/vendor/URI.min",
@@ -180,10 +178,13 @@ requirejs.config({
             exports: "sinon"
         },
         "jasmine-imagediff": {},
-        "jasmine-stealth": {
+        "common/js/spec_helpers/jasmine-extensions": {
+            deps: ["jquery"]
+        },
+        "common/js/spec_helpers/jasmine-stealth": {
             deps: ["underscore", "underscore.string"]
         },
-        "jasmine-waituntil": {
+        "common/js/spec_helpers/jasmine-waituntil": {
             deps: ["jquery"]
         },
         "xblock/core": {
@@ -283,8 +284,14 @@ while i < testFiles.length
     testFiles[i] = '/base/' + testFiles[i] + '.js'
     i++
 
+specHelpers = [
+  'common/js/spec_helpers/jasmine-extensions',
+  'common/js/spec_helpers/jasmine-stealth',
+  'common/js/spec_helpers/jasmine-waituntil'
+]
+
 # Jasmine has a global stack for creating a tree of specs. We need to load
 # spec files one by one, otherwise some end up getting nested under others.
-requireSerial testFiles, ->
+requireSerial specHelpers.concat(testFiles), ->
 # start test run, once Require.js is done
     window.__karma__.start()
diff --git a/cms/static/coffee/spec/main_spec.coffee b/cms/static/coffee/spec/main_spec.coffee
index ee68e31326..39098691ea 100644
--- a/cms/static/coffee/spec/main_spec.coffee
+++ b/cms/static/coffee/spec/main_spec.coffee
@@ -1,5 +1,4 @@
-require ["jquery", "backbone", "coffee/src/main", "common/js/spec_helpers/ajax_helpers",
-         "jasmine-stealth", "jasmine-waituntil", "jquery.cookie"],
+require ["jquery", "backbone", "coffee/src/main", "common/js/spec_helpers/ajax_helpers", "jquery.cookie"],
 ($, Backbone, main, AjaxHelpers) ->
     describe "CMS", ->
         it "should initialize URL", ->
diff --git a/cms/static/coffee/spec/main_squire.coffee b/cms/static/coffee/spec/main_squire.coffee
index a3480f3516..646975976b 100644
--- a/cms/static/coffee/spec/main_squire.coffee
+++ b/cms/static/coffee/spec/main_squire.coffee
@@ -41,8 +41,6 @@ requirejs.config({
         "modernizr": "xmodule_js/common_static/edx-pattern-library/js/modernizr-custom",
         "afontgarde": "xmodule_js/common_static/edx-pattern-library/js/afontgarde",
         "edxicons": "xmodule_js/common_static/edx-pattern-library/js/edx-icons",
-        "jasmine-stealth": "xmodule_js/common_static/js/libs/jasmine-stealth",
-        "jasmine-waituntil": "xmodule_js/common_static/js/libs/jasmine-waituntil",
         "draggabilly": "xmodule_js/common_static/js/vendor/draggabilly",
         "domReady": "xmodule_js/common_static/js/vendor/domReady",
         "URI": "xmodule_js/common_static/js/vendor/URI.min",
@@ -160,10 +158,13 @@ requirejs.config({
         "sinon": {
             exports: "sinon"
         },
-        "jasmine-stealth": {
+        "common/js/spec_helpers/jasmine-extensions": {
+            deps: ["jquery"]
+        },
+        "common/js/spec_helpers/jasmine-stealth": {
             deps: ["underscore", "underscore.string"]
         },
-        "jasmine-waituntil": {
+        "common/js/spec_helpers/jasmine-waituntil": {
             deps: ["jquery"]
         },
         "xblock/core": {
@@ -203,8 +204,14 @@ while i < testFiles.length
     testFiles[i] = '/base/' + testFiles[i] + '.js'
     i++
 
+specHelpers = [
+  'common/js/spec_helpers/jasmine-extensions',
+  'common/js/spec_helpers/jasmine-stealth',
+  'common/js/spec_helpers/jasmine-waituntil'
+]
+
 # Jasmine has a global stack for creating a tree of specs. We need to load
 # spec files one by one, otherwise some end up getting nested under others.
-requireSerial testFiles, ->
+requireSerial specHelpers.concat(testFiles), ->
 # start test run, once Require.js is done
     window.__karma__.start()
diff --git a/cms/static/coffee/spec/views/textbook_spec.coffee b/cms/static/coffee/spec/views/textbook_spec.coffee
index 01e6134d58..b2a251fb6d 100644
--- a/cms/static/coffee/spec/views/textbook_spec.coffee
+++ b/cms/static/coffee/spec/views/textbook_spec.coffee
@@ -2,7 +2,7 @@ define ["js/models/textbook", "js/models/chapter", "js/collections/chapter", "js
     "js/collections/textbook", "js/views/show_textbook", "js/views/edit_textbook", "js/views/list_textbooks",
     "js/views/edit_chapter", "common/js/components/views/feedback_prompt",
     "common/js/components/views/feedback_notification", "common/js/components/utils/view_utils","common/js/spec_helpers/ajax_helpers",
-    "js/spec_helpers/modal_helpers", "jasmine-stealth"],
+    "js/spec_helpers/modal_helpers"],
 (Textbook, Chapter, ChapterSet, Course, TextbookSet, ShowTextbook, EditTextbook, ListTextbooks, EditChapter, Prompt, Notification, ViewUtils, AjaxHelpers, modal_helpers) ->
 
     describe "ShowTextbook", ->
diff --git a/cms/static/js/spec/views/group_configuration_spec.js b/cms/static/js/spec/views/group_configuration_spec.js
index b049f2f190..db924cfb62 100644
--- a/cms/static/js/spec/views/group_configuration_spec.js
+++ b/cms/static/js/spec/views/group_configuration_spec.js
@@ -5,7 +5,7 @@ define([
     'js/views/group_configuration_item', 'js/views/experiment_group_edit', 'js/views/content_group_list',
     'js/views/content_group_details', 'js/views/content_group_editor', 'js/views/content_group_item',
     'common/js/components/views/feedback_notification', 'common/js/spec_helpers/ajax_helpers', 'common/js/spec_helpers/template_helpers',
-    'common/js/spec_helpers/view_helpers', 'jasmine-stealth'
+    'common/js/spec_helpers/view_helpers'
 ], function(
     _, Course, GroupConfigurationModel, GroupModel, GroupConfigurationCollection, GroupCollection,
     GroupConfigurationDetailsView, GroupConfigurationsListView, GroupConfigurationEditorView,
diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js
index 076221ac8f..8e0a2b0950 100644
--- a/cms/static/karma_cms.conf.js
+++ b/cms/static/karma_cms.conf.js
@@ -8,10 +8,6 @@ var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
 var files = {
-    libraryFilesToInclude: [
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true}
-    ],
-
     libraryFiles: [
         {pattern: 'edx-pattern-library/js/**/*.js'},
         {pattern: 'edx-ui-toolkit/js/**/*.js'},
@@ -19,9 +15,6 @@ var files = {
         {pattern: 'xmodule_js/common_static/common/js/vendor/**/*.js'},
         {pattern: 'xmodule_js/common_static/js/**/*.js'},
         {pattern: 'xmodule_js/src/xmodule.js'},
-
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-stealth.js'},
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js'}
     ],
 
     sourceFiles: [
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index 097e80aa11..2737ec359b 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -8,10 +8,6 @@ var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
 var files = {
-    libraryFilesToInclude: [
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true}
-    ],
-
     libraryFiles: [
         {pattern: 'edx-pattern-library/js/**/*.js'},
         {pattern: 'edx-ui-toolkit/js/**/*.js'},
diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
index cf010e0b9c..d61c82f7ee 100644
--- a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
+++ b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
@@ -39,8 +39,8 @@ var files = {
         {pattern: 'src/word_cloud/d3.min.js', included: true},
 
         {pattern: 'common_static/js/vendor/jasmine-imagediff.js', included: true},
-        {pattern: 'common_static/js/libs/jasmine-waituntil.js', included: true},
-        {pattern: 'common_static/js/libs/jasmine-extensions.js', included: true},
+        {pattern: 'common_static/common/js/spec_helpers/jasmine-waituntil.js', included: true},
+        {pattern: 'common_static/common/js/spec_helpers/jasmine-extensions.js', included: true},
         {pattern: 'common_static/js/vendor/sinon-1.17.0.js', included: true}
     ],
 
diff --git a/common/static/common/js/spec/components/feedback_spec.js b/common/static/common/js/spec/components/feedback_spec.js
index ed390c1810..9f61a36d7d 100644
--- a/common/static/common/js/spec/components/feedback_spec.js
+++ b/common/static/common/js/spec/components/feedback_spec.js
@@ -3,7 +3,7 @@
   'use strict';
   define(["jquery", "common/js/components/views/feedback", "common/js/components/views/feedback_notification",
           "common/js/components/views/feedback_alert", "common/js/components/views/feedback_prompt",
-          'common/js/spec_helpers/view_helpers', "sinon", "jquery.simulate", "jasmine-waituntil"],
+          'common/js/spec_helpers/view_helpers', "sinon", "jquery.simulate"],
     function($, SystemFeedback, NotificationView, AlertView, PromptView, ViewHelpers, sinon) {
     var tpl;
     tpl = readFixtures('common/templates/components/system-feedback.underscore');
diff --git a/common/static/common/js/spec/components/view_utils_spec.js b/common/static/common/js/spec/components/view_utils_spec.js
index 6ac85efe88..cef36bc46d 100644
--- a/common/static/common/js/spec/components/view_utils_spec.js
+++ b/common/static/common/js/spec/components/view_utils_spec.js
@@ -1,7 +1,7 @@
 ;(function (define) {
     'use strict';
     define(["jquery", "underscore", "backbone", "common/js/components/utils/view_utils",
-            "common/js/spec_helpers/view_helpers", "jasmine-stealth"],
+            "common/js/spec_helpers/view_helpers"],
         function ($, _, Backbone, ViewUtils, ViewHelpers) {
 
             describe("ViewUtils", function() {
diff --git a/common/static/common/js/spec/main_requirejs.js b/common/static/common/js/spec/main_requirejs.js
index c859348826..15fc9ca853 100644
--- a/common/static/common/js/spec/main_requirejs.js
+++ b/common/static/common/js/spec/main_requirejs.js
@@ -34,10 +34,7 @@
             'modernizr': 'edx-pattern-library/js/modernizr-custom',
             'afontgarde': 'edx-pattern-library/js/afontgarde',
             'edxicons': 'edx-pattern-library/js/edx-icons',
-            'draggabilly': 'js/vendor/draggabilly',
-            'jasmine-stealth': 'js/libs/jasmine-stealth',
-            'jasmine-waituntil': 'js/libs/jasmine-waituntil',
-            'jasmine-extensions': 'js/libs/jasmine-extensions'
+            'draggabilly': 'js/vendor/draggabilly'
         },
         shim: {
             'gettext': {
@@ -140,13 +137,13 @@
                 exports: 'URI'
             },
             'jasmine-imagediff': {},
-            'jasmine-stealth': {
-                deps: ['underscore', 'underscore.string']
-            },
-            'jasmine-waituntil': {
+            'common/js/spec_helpers/jasmine-extensions': {
                 deps: ['jquery']
             },
-            'jasmine-extensions': {
+            'common/js/spec_helpers/jasmine-stealth': {
+                deps: ['underscore', 'underscore.string']
+            },
+            'common/js/spec_helpers/jasmine-waituntil': {
                 deps: ['jquery']
             },
             "sinon": {
@@ -178,7 +175,13 @@
         testFiles[i] = '/base/' + testFiles[i];
     }
 
-    window.requireSerial(testFiles, function () {
+    var specHelpers = [
+        'common/js/spec_helpers/jasmine-extensions',
+        'common/js/spec_helpers/jasmine-stealth',
+        'common/js/spec_helpers/jasmine-waituntil'
+    ];
+
+    window.requireSerial(specHelpers.concat(testFiles), function () {
         // start test run, once Require.js is done
         window.__karma__.start();
     });
diff --git a/common/static/js/libs/jasmine-extensions.js b/common/static/common/js/spec_helpers/jasmine-extensions.js
similarity index 100%
rename from common/static/js/libs/jasmine-extensions.js
rename to common/static/common/js/spec_helpers/jasmine-extensions.js
diff --git a/common/static/js/libs/jasmine-stealth.js b/common/static/common/js/spec_helpers/jasmine-stealth.js
similarity index 100%
rename from common/static/js/libs/jasmine-stealth.js
rename to common/static/common/js/spec_helpers/jasmine-stealth.js
diff --git a/common/static/js/libs/jasmine-waituntil.js b/common/static/common/js/spec_helpers/jasmine-waituntil.js
similarity index 100%
rename from common/static/js/libs/jasmine-waituntil.js
rename to common/static/common/js/spec_helpers/jasmine-waituntil.js
diff --git a/common/static/karma_common.conf.js b/common/static/karma_common.conf.js
index bf267c07e1..95f8c45549 100644
--- a/common/static/karma_common.conf.js
+++ b/common/static/karma_common.conf.js
@@ -31,8 +31,8 @@ var files = {
         {pattern: 'edx-pattern-library/js/edx-icons.js', included: true},
 
         {pattern: 'js/vendor/jasmine-imagediff.js', included: true},
-        {pattern: 'js/libs/jasmine-waituntil.js', included: true},
-        {pattern: 'js/libs/jasmine-extensions.js', included: true}
+        {pattern: 'common/js/spec_helpers/jasmine-extensions.js', included: true},
+        {pattern: 'common/js/spec_helpers/jasmine-waituntil.js', included: true}
     ],
 
     libraryFiles: [
diff --git a/common/static/karma_common_requirejs.conf.js b/common/static/karma_common_requirejs.conf.js
index d0a5e641a7..bcfb357929 100644
--- a/common/static/karma_common_requirejs.conf.js
+++ b/common/static/karma_common_requirejs.conf.js
@@ -9,10 +9,6 @@ var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
 var files = {
-    libraryFilesToInclude: [
-        {pattern: 'js/libs/jasmine-extensions.js', included: true}
-    ],
-
     libraryFiles: [
         {pattern: 'coffee/src/**/*.js'},
         {pattern: 'common/js/spec_helpers/**/*.js'},
diff --git a/lms/static/js/spec/main.js b/lms/static/js/spec/main.js
index 61ad7e77c4..b628546545 100644
--- a/lms/static/js/spec/main.js
+++ b/lms/static/js/spec/main.js
@@ -46,9 +46,6 @@
             'sinon': 'xmodule_js/common_static/js/vendor/sinon-1.17.0',
             'squire': 'xmodule_js/common_static/js/vendor/Squire',
             'jasmine-imagediff': 'xmodule_js/common_static/js/vendor/jasmine-imagediff',
-            'jasmine-stealth': 'xmodule_js/common_static/js/vendor/jasmine-stealth',
-            'jasmine-waituntil': 'xmodule_js/common_static/js/libs/jasmine-waituntil',
-            'jasmine-extensions': 'xmodule_js/common_static/js/libs/jasmine-extensions',
             'domReady': 'xmodule_js/common_static/js/vendor/domReady',
             'mathjax': '//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_SVG&delayStartupUntil=configured', // jshint ignore:line
             'youtube': '//www.youtube.com/player_api?noext',
@@ -260,13 +257,13 @@
                 exports: 'sinon'
             },
             'jasmine-imagediff': {},
-            'jasmine-stealth': {
-                deps: ['underscore', 'underscore.string']
-            },
-            'jasmine-waituntil': {
+            'common/js/spec_helpers/jasmine-extensions': {
                 deps: ['jquery']
             },
-            'jasmine-extensions': {
+            'common/js/spec_helpers/jasmine-stealth': {
+                deps: ['underscore', 'underscore.string']
+            },
+            'common/js/spec_helpers/jasmine-waituntil': {
                 deps: ['jquery']
             },
             'xblock/core': {
@@ -777,11 +774,16 @@
         testFiles[i] = '/base/' + testFiles[i];
     }
 
+    var specHelpers = [
+        'common/js/spec_helpers/jasmine-extensions',
+        'common/js/spec_helpers/jasmine-stealth',
+        'common/js/spec_helpers/jasmine-waituntil'
+    ];
+
     // Jasmine has a global stack for creating a tree of specs. We need to load
     // spec files one by one, otherwise some end up getting nested under others.
-    window.requireSerial(testFiles, function () {
+    window.requireSerial(specHelpers.concat(testFiles), function () {
         // start test run, once Require.js is done
         window.__karma__.start();
     });
-
 }).call(this, requirejs, define);
diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js
index c205595e61..61131571d8 100644
--- a/lms/static/karma_lms.conf.js
+++ b/lms/static/karma_lms.conf.js
@@ -12,8 +12,6 @@ var files = {
         {pattern: 'xmodule_js/common_static/js/vendor/jquery.event.drag-2.2.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/slick.core.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/slick.grid.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-waituntil.js', included: true}
     ],
 
     libraryFiles: [
diff --git a/lms/static/karma_lms_coffee.conf.js b/lms/static/karma_lms_coffee.conf.js
index f488b35664..2d7d269054 100644
--- a/lms/static/karma_lms_coffee.conf.js
+++ b/lms/static/karma_lms_coffee.conf.js
@@ -36,7 +36,7 @@ var files = {
         {pattern: 'xmodule_js/src/xmodule.js', included: true},
 
         {pattern: 'xmodule_js/common_static/js/vendor/jasmine-imagediff.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true}
+        {pattern: 'common/js/spec_helpers/jasmine-extensions.js', included: true}
     ],
 
     libraryFiles: [

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 08/11] 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;

From 6ed935383beb851d9d3c6326a79c5df58fd582c7 Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Thu, 5 May 2016 16:25:45 +0500
Subject: [PATCH 09/11] Remove xmodule_js prefix from paths of edx-ui-toolkit,
 edx-pattern-library and common.

---
 cms/static/coffee/spec/main.coffee        | 12 ++++++------
 cms/static/coffee/spec/main_squire.coffee |  8 ++++----
 cms/static/karma_cms.conf.js              |  4 ++--
 cms/static/karma_cms_squire.conf.js       |  4 ++--
 lms/static/js/spec/main.js                | 10 +++++-----
 lms/static/karma_lms.conf.js              |  5 ++---
 lms/static/karma_lms_coffee.conf.js       |  4 ++--
 7 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee
index f42b2f74f5..73fe664d8d 100644
--- a/cms/static/coffee/spec/main.coffee
+++ b/cms/static/coffee/spec/main.coffee
@@ -27,9 +27,9 @@ requirejs.config({
         "moment": "xmodule_js/common_static/js/vendor/moment.min",
         "moment-with-locales": "xmodule_js/common_static/js/vendor/moment-with-locales.min",
         "text": "xmodule_js/common_static/js/vendor/requirejs/text",
-        "underscore": "xmodule_js/common_static/common/js/vendor/underscore",
-        "underscore.string": "xmodule_js/common_static/common/js/vendor/underscore.string",
-        "backbone": "xmodule_js/common_static/common/js/vendor/backbone",
+        "underscore": "common/js/vendor/underscore",
+        "underscore.string": "common/js/vendor/underscore.string",
+        "backbone": "common/js/vendor/backbone",
         "backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min",
         "backbone.paginator": "xmodule_js/common_static/js/vendor/backbone.paginator.min",
         "backbone-relational": "xmodule_js/common_static/js/vendor/backbone-relational.min",
@@ -48,9 +48,9 @@ requirejs.config({
         "domReady": "xmodule_js/common_static/js/vendor/domReady",
         "URI": "xmodule_js/common_static/js/vendor/URI.min",
         "mock-ajax": "xmodule_js/common_static/js/vendor/mock-ajax",
-        "modernizr": "xmodule_js/common_static/edx-pattern-library/js/modernizr-custom",
-        "afontgarde": "xmodule_js/common_static/edx-pattern-library/js/afontgarde",
-        "edxicons": "xmodule_js/common_static/edx-pattern-library/js/edx-icons",
+        "modernizr": "edx-pattern-library/js/modernizr-custom",
+        "afontgarde": "edx-pattern-library/js/afontgarde",
+        "edxicons": "edx-pattern-library/js/edx-icons",
 
         "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_SVG&delayStartupUntil=configured",
         "youtube": "//www.youtube.com/player_api?noext",
diff --git a/cms/static/coffee/spec/main_squire.coffee b/cms/static/coffee/spec/main_squire.coffee
index 646975976b..3e86a658c1 100644
--- a/cms/static/coffee/spec/main_squire.coffee
+++ b/cms/static/coffee/spec/main_squire.coffee
@@ -26,7 +26,7 @@ requirejs.config({
         "text": "xmodule_js/common_static/js/vendor/requirejs/text",
         "underscore": "common/js/vendor/underscore",
         "underscore.string": "common/js/vendor/underscore.string",
-        "backbone": "xmodule_js/common_static/common/js/vendor/backbone",
+        "backbone": "common/js/vendor/backbone",
         "backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min",
         "backbone.paginator": "xmodule_js/common_static/js/vendor/backbone.paginator.min",
         "tinymce": "xmodule_js/common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min",
@@ -38,9 +38,9 @@ requirejs.config({
         "utility": "xmodule_js/common_static/js/src/utility",
         "sinon": "xmodule_js/common_static/js/vendor/sinon-1.17.0",
         "squire": "xmodule_js/common_static/js/vendor/Squire",
-        "modernizr": "xmodule_js/common_static/edx-pattern-library/js/modernizr-custom",
-        "afontgarde": "xmodule_js/common_static/edx-pattern-library/js/afontgarde",
-        "edxicons": "xmodule_js/common_static/edx-pattern-library/js/edx-icons",
+        "modernizr": "edx-pattern-library/js/modernizr-custom",
+        "afontgarde": "edx-pattern-library/js/afontgarde",
+        "edxicons": "edx-pattern-library/js/edx-icons",
         "draggabilly": "xmodule_js/common_static/js/vendor/draggabilly",
         "domReady": "xmodule_js/common_static/js/vendor/domReady",
         "URI": "xmodule_js/common_static/js/vendor/URI.min",
diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js
index 8e0a2b0950..00712592ba 100644
--- a/cms/static/karma_cms.conf.js
+++ b/cms/static/karma_cms.conf.js
@@ -9,12 +9,12 @@ var configModule = require(path.join(__dirname, '../../common/static/common/js/k
 
 var files = {
     libraryFiles: [
+        {pattern: 'common/js/vendor/**/*.js'},
         {pattern: 'edx-pattern-library/js/**/*.js'},
         {pattern: 'edx-ui-toolkit/js/**/*.js'},
         {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/**/*.js'},
         {pattern: 'xmodule_js/common_static/js/**/*.js'},
-        {pattern: 'xmodule_js/src/xmodule.js'},
+        {pattern: 'xmodule_js/src/xmodule.js'}
     ],
 
     sourceFiles: [
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index 2737ec359b..49503e01a5 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -9,12 +9,12 @@ var configModule = require(path.join(__dirname, '../../common/static/common/js/k
 
 var files = {
     libraryFiles: [
+        {pattern: 'common/js/vendor/**/*.js'},
         {pattern: 'edx-pattern-library/js/**/*.js'},
         {pattern: 'edx-ui-toolkit/js/**/*.js'},
         {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/**/*.js'},
         {pattern: 'xmodule_js/common_static/js/**/*.js'},
-        {pattern: 'xmodule_js/src/**/*.js'},
+        {pattern: 'xmodule_js/src/**/*.js'}
     ],
 
     sourceFiles: [
diff --git a/lms/static/js/spec/main.js b/lms/static/js/spec/main.js
index b628546545..ccbedb09b6 100644
--- a/lms/static/js/spec/main.js
+++ b/lms/static/js/spec/main.js
@@ -33,7 +33,7 @@
             'text': 'xmodule_js/common_static/js/vendor/requirejs/text',
             'underscore': 'common/js/vendor/underscore',
             'underscore.string': 'common/js/vendor/underscore.string',
-            'backbone': 'xmodule_js/common_static/common/js/vendor/backbone',
+            'backbone': 'common/js/vendor/backbone',
             'backbone.associations': 'xmodule_js/common_static/js/vendor/backbone-associations-min',
             'backbone.paginator': 'xmodule_js/common_static/js/vendor/backbone.paginator.min',
             'backbone-super': 'js/vendor/backbone-super',
@@ -66,9 +66,9 @@
             'MathJaxProcessor': 'coffee/src/customwmd',
             'picturefill': 'common/js/vendor/picturefill',
             'draggabilly': 'xmodule_js/common_static/js/vendor/draggabilly',
-            'modernizr': 'xmodule_js/common_static/edx-pattern-library/js/modernizr-custom',
-            'afontgarde': 'xmodule_js/common_static/edx-pattern-library/js/afontgarde',
-            'edxicons': 'xmodule_js/common_static/edx-pattern-library/js/edx-icons',
+            'modernizr': 'edx-pattern-library/js/modernizr-custom',
+            'afontgarde': 'edx-pattern-library/js/afontgarde',
+            'edxicons': 'edx-pattern-library/js/edx-icons',
 
             // Manually specify LMS files that are not converted to RequireJS
             'history': 'js/vendor/history',
@@ -101,7 +101,7 @@
             'annotator_1.2.9': 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min',
 
             // Common edx utils
-            'common/js/utils/edx.utils.validate': 'xmodule_js/common_static/common/js/utils/edx.utils.validate',
+            'common/js/utils/edx.utils.validate': 'common/js/utils/edx.utils.validate',
             'slick.core': 'xmodule_js/common_static/js/vendor/slick.core',
             'slick.grid': 'xmodule_js/common_static/js/vendor/slick.grid'
         },
diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js
index 61131571d8..c9363d2405 100644
--- a/lms/static/karma_lms.conf.js
+++ b/lms/static/karma_lms.conf.js
@@ -11,7 +11,7 @@ var files = {
     libraryFilesToInclude: [
         {pattern: 'xmodule_js/common_static/js/vendor/jquery.event.drag-2.2.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/slick.core.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/vendor/slick.grid.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/slick.grid.js', included: true}
     ],
 
     libraryFiles: [
@@ -20,7 +20,6 @@ var files = {
         {pattern: 'edx-ui-toolkit/js/**/*.js'},
         {pattern: 'js/RequireJS-namespace-undefine.js'},
         {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
-        {pattern: 'xmodule_js/common_static/common/js/**/*.js'},
         {pattern: 'xmodule_js/common_static/js/**/*.js'},
         {pattern: 'xmodule_js/src/capa/*.js'},
         {pattern: 'xmodule_js/src/video/*.js'},
@@ -32,7 +31,7 @@ var files = {
         {pattern: 'js/**/!(*spec|djangojs).js'},
         {pattern: 'support/js/**/!(*spec).js'},
         {pattern: 'teams/js/**/!(*spec).js'},
-        {pattern: 'xmodule_js/common_static/coffee/**/!(*spec).js'},
+        {pattern: 'xmodule_js/common_static/coffee/**/!(*spec).js'}
     ],
 
     specFiles: [
diff --git a/lms/static/karma_lms_coffee.conf.js b/lms/static/karma_lms_coffee.conf.js
index 2d7d269054..5c7a6e13b7 100644
--- a/lms/static/karma_lms_coffee.conf.js
+++ b/lms/static/karma_lms_coffee.conf.js
@@ -15,8 +15,8 @@ var files = {
 
         {pattern: 'js/RequireJS-namespace-undefine.js', included: true},
         {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: true},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: true},
-        {pattern: 'xmodule_js/common_static/edx-ui-toolkit/js/utils/global-loader.js', included: true},
+        {pattern: 'common/js/vendor/underscore.js', included: true},
+        {pattern: 'edx-ui-toolkit/js/utils/global-loader.js', included: true},
         {pattern: 'xmodule_js/common_static/js/src/logger.js', included: true},
         {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js', included: true},

From 667a9b9ae605cd8c5ca8f61c20ce4b21413cd631 Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Thu, 5 May 2016 18:00:23 +0500
Subject: [PATCH 10/11] Moved common files into karma.common.conf.js.

---
 cms/static/karma_cms.conf.js                  | 21 +++-----
 cms/static/karma_cms_squire.conf.js           | 21 +++-----
 .../xmodule/xmodule/js/karma_xmodule.conf.js  | 16 ++++---
 common/static/common/js/karma.common.conf.js  | 48 +++++++++++++++----
 common/static/karma_common.conf.js            | 20 ++++----
 common/static/karma_common_requirejs.conf.js  | 26 ++++------
 lms/static/karma_lms.conf.js                  | 27 ++++-------
 lms/static/karma_lms_coffee.conf.js           | 16 +++----
 8 files changed, 95 insertions(+), 100 deletions(-)

diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js
index 00712592ba..2a4cf11a0b 100644
--- a/cms/static/karma_cms.conf.js
+++ b/cms/static/karma_cms.conf.js
@@ -7,19 +7,14 @@
 var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var files = {
-    libraryFiles: [
-        {pattern: 'common/js/vendor/**/*.js'},
-        {pattern: 'edx-pattern-library/js/**/*.js'},
-        {pattern: 'edx-ui-toolkit/js/**/*.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
-        {pattern: 'xmodule_js/common_static/js/**/*.js'},
-        {pattern: 'xmodule_js/src/xmodule.js'}
-    ],
+var options = {
+
+    includeCommonFiles: true,
+
+    libraryFiles: [],
 
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
-        {pattern: 'common/js/**/!(*spec).js'},
         {pattern: 'js/**/!(*spec|djangojs).js'}
     ],
 
@@ -31,7 +26,6 @@ var files = {
 
     fixtureFiles: [
         {pattern: 'coffee/fixtures/**/*.underscore'},
-        {pattern: 'common/templates/**/*.underscore'},
         {pattern: 'templates/**/*.underscore'}
     ],
 
@@ -41,8 +35,5 @@ var files = {
 };
 
 module.exports = function (config) {
-    configModule.configure({
-        config: config,
-        files: files
-    });
+    configModule.configure(config, options);
 };
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index 49503e01a5..cd31114443 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -7,19 +7,14 @@
 var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var files = {
-    libraryFiles: [
-        {pattern: 'common/js/vendor/**/*.js'},
-        {pattern: 'edx-pattern-library/js/**/*.js'},
-        {pattern: 'edx-ui-toolkit/js/**/*.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
-        {pattern: 'xmodule_js/common_static/js/**/*.js'},
-        {pattern: 'xmodule_js/src/**/*.js'}
-    ],
+var options = {
+
+    includeCommonFiles: true,
+
+    libraryFiles: [],
 
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
-        {pattern: 'common/js/**/!(*spec).js'},
         {pattern: 'js/**/!(*spec|djangojs).js'}
     ],
 
@@ -30,7 +25,6 @@ var files = {
 
     fixtureFiles: [
         {pattern: 'coffee/fixtures/**/*.*'},
-        {pattern: 'common/templates/**/*.*'},
         {pattern: 'templates/**/*.*'}
     ],
 
@@ -40,8 +34,5 @@ var files = {
 };
 
 module.exports = function (config) {
-    configModule.configure({
-        config: config,
-        files: files
-    });
+    configModule.configure(config, options);
 };
diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
index d61c82f7ee..4631f2c48c 100644
--- a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
+++ b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
@@ -8,7 +8,14 @@
 var path = require('path');
 var configModule = require(path.join(__dirname, 'common_static/common/js/karma.common.conf.js'));
 
-var files = {
+var options = {
+
+    useRequireJs: false,
+
+    normalizePathsForCoverageFunc: function(appRoot, pattern) {
+        return pattern;
+    },
+
     libraryFilesToInclude: [
         {pattern: 'common_static/js/vendor/requirejs/require.js', included: true},
         {pattern: 'RequireJS-namespace-undefine.js', included: true},
@@ -68,10 +75,5 @@ var files = {
 };
 
 module.exports = function (config) {
-    configModule.configure({
-        config: config,
-        files: files,
-        normalizePathsForCoverageFunc: function(appRoot, pattern) { return pattern; },
-        useRequireJs: false
-    });
+    configModule.configure(config, options);
 };
diff --git a/common/static/common/js/karma.common.conf.js b/common/static/common/js/karma.common.conf.js
index 649c15195c..110e8d3e95 100644
--- a/common/static/common/js/karma.common.conf.js
+++ b/common/static/common/js/karma.common.conf.js
@@ -29,6 +29,30 @@ var path = require('path');
 var _ = require('underscore');
 var appRoot = path.join(__dirname, '../../../../');
 
+var commonFiles = {
+    libraryFiles: [
+        {pattern: 'common/js/vendor/**/*.js'},
+        {pattern: 'edx-pattern-library/js/**/*.js'},
+        {pattern: 'edx-ui-toolkit/js/**/*.js'},
+        {pattern: 'xmodule_js/common_static/coffee/src/**/!(*spec).js'},
+        {pattern: 'xmodule_js/common_static/js/**/!(*spec).js'},
+        {pattern: 'xmodule_js/src/**/*.js'}
+    ],
+
+    sourceFiles: [
+        {pattern: 'common/js/components/**/*.js'},
+        {pattern: 'common/js/utils/**/*.js'}
+    ],
+
+    specFiles: [
+        {pattern: 'common/js/spec_helpers/**/*.js'}
+    ],
+
+    fixtureFiles: [
+        {pattern: 'common/templates/**/*.underscore'}
+    ]
+};
+
 /**
  * Customize the name attribute in xml testcase element
  * @param {Object} browser
@@ -290,14 +314,20 @@ var getBaseConfig = function (config, useRequireJs) {
     };
 };
 
-var configure = function(data) {
-    var useRequireJs = data.useRequireJs === undefined ? true : useRequireJs,
-        baseConfig = getBaseConfig(data.config, useRequireJs);
+var configure = function(config, options) {
+    var useRequireJs = options.useRequireJs === undefined ? true : useRequireJs,
+        baseConfig = getBaseConfig(config, useRequireJs);
+
+    if (options.includeCommonFiles) {
+        _.forEach(['libraryFiles', 'sourceFiles', 'specFiles', 'fixtureFiles'], function (collectionName) {
+            options[collectionName] = _.flatten([commonFiles[collectionName], options[collectionName]]);
+        });
+    }
 
     var files = _.flatten(
         _.map(
             ['libraryFilesToInclude', 'libraryFiles', 'sourceFiles', 'specFiles', 'fixtureFiles', 'runFiles'],
-            function(item) { return data.files[item] || []; }
+            function(collectionName) { return options[collectionName] || []; }
         )
     );
 
@@ -314,22 +344,22 @@ var configure = function(data) {
     // With nocache=true, Karma always serves the latest files from disk.
     // However, that prevents coverage tracking from working.
     // So we only set it if coverage tracking is off.
-    setNocache(files, !data.config.coverage);
+    setNocache(files, !config.coverage);
 
     var filesForCoverage = _.flatten(
         _.map(
             ['sourceFiles', 'specFiles'],
-            function(item) { return data.files[item]; }
+            function(collectionName) { return options[collectionName]; }
         )
     );
 
     var preprocessors = _.extend(
       {},
-      data.preprocessors,
-      normalizePathsForCoverage(filesForCoverage, data.normalizePathsForCoverageFunc)
+      options.preprocessors,
+      normalizePathsForCoverage(filesForCoverage, options.normalizePathsForCoverageFunc)
     );
 
-    data.config.set(_.extend(baseConfig, {
+    config.set(_.extend(baseConfig, {
         files: files,
         preprocessors: preprocessors
     }));
diff --git a/common/static/karma_common.conf.js b/common/static/karma_common.conf.js
index 95f8c45549..7c2968e9f0 100644
--- a/common/static/karma_common.conf.js
+++ b/common/static/karma_common.conf.js
@@ -7,7 +7,14 @@
 var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var files = {
+var options = {
+
+    useRequireJs: false,
+
+    normalizePathsForCoverageFunc: function (appRoot, pattern) {
+        return path.join(appRoot, '/common/static/' + pattern);
+    },
+
     libraryFilesToInclude: [
         {pattern: 'coffee/src/ajax_prefix.js', included: true},
         {pattern: 'js/vendor/draggabilly.js', included: true},
@@ -58,15 +65,6 @@ var files = {
     ]
 };
 
-var normalizePathsForCoverageFunc = function (appRoot, pattern) {
-    return path.join(appRoot, '/common/static/' + pattern);
-};
-
 module.exports = function (config) {
-    configModule.configure({
-        config: config,
-        files: files,
-        normalizePathsForCoverageFunc: normalizePathsForCoverageFunc,
-        useRequireJs: false
-    });
+    configModule.configure(config, options);
 };
diff --git a/common/static/karma_common_requirejs.conf.js b/common/static/karma_common_requirejs.conf.js
index bcfb357929..9ccbed23fb 100644
--- a/common/static/karma_common_requirejs.conf.js
+++ b/common/static/karma_common_requirejs.conf.js
@@ -8,20 +8,22 @@
 var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var files = {
+var options = {
+
+    includeCommonFiles: true,
+
+    normalizePathsForCoverageFunc: function (appRoot, pattern) {
+        return path.join(appRoot, '/common/static/' + pattern);
+    },
+
     libraryFiles: [
         {pattern: 'coffee/src/**/*.js'},
-        {pattern: 'common/js/spec_helpers/**/*.js'},
-        {pattern: 'common/js/vendor/**/*.js'},
         {pattern: 'js/libs/**/*.js'},
         {pattern: 'js/test/**/*.js'},
         {pattern: 'js/vendor/**/*.js'}
     ],
 
-    sourceFiles: [
-        {pattern: 'common/js/components/**/!(*spec).js'},
-        {pattern: 'common/js/utils/**/!(*spec).js'}
-    ],
+    sourceFiles: [],
 
     specFiles: [
         {pattern: 'common/js/spec/**/*spec.js'}
@@ -36,14 +38,6 @@ var files = {
     ]
 };
 
-var normalizePathsForCoverageFunc = function (appRoot, pattern) {
-    return path.join(appRoot, '/common/static/' + pattern);
-};
-
 module.exports = function (config) {
-    configModule.configure({
-        config: config,
-        files: files,
-        normalizePathsForCoverageFunc: normalizePathsForCoverageFunc
-    });
+    configModule.configure(config, options);
 };
diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js
index c9363d2405..94526960ce 100644
--- a/lms/static/karma_lms.conf.js
+++ b/lms/static/karma_lms.conf.js
@@ -7,7 +7,10 @@
 var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var files = {
+var options = {
+
+    includeCommonFiles: true,
+
     libraryFilesToInclude: [
         {pattern: 'xmodule_js/common_static/js/vendor/jquery.event.drag-2.2.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/slick.core.js', included: true},
@@ -15,34 +18,25 @@ var files = {
     ],
 
     libraryFiles: [
-        {pattern: 'common/js/**/*.js'},
-        {pattern: 'edx-pattern-library/js/**/*.js'},
-        {pattern: 'edx-ui-toolkit/js/**/*.js'},
-        {pattern: 'js/RequireJS-namespace-undefine.js'},
-        {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
-        {pattern: 'xmodule_js/common_static/js/**/*.js'},
-        {pattern: 'xmodule_js/src/capa/*.js'},
-        {pattern: 'xmodule_js/src/video/*.js'},
-        {pattern: 'xmodule_js/src/xmodule.js'}
+        {pattern: 'js/RequireJS-namespace-undefine.js'}
     ],
 
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
         {pattern: 'js/**/!(*spec|djangojs).js'},
         {pattern: 'support/js/**/!(*spec).js'},
-        {pattern: 'teams/js/**/!(*spec).js'},
-        {pattern: 'xmodule_js/common_static/coffee/**/!(*spec).js'}
+        {pattern: 'teams/js/**/!(*spec).js'}
     ],
 
     specFiles: [
         {pattern: 'js/spec/**/*spec.js'},
         {pattern: 'support/js/spec/**/*spec.js'},
-        {pattern: 'teams/js/spec/**/*spec.js'}
+        {pattern: 'teams/js/spec/**/*spec.js'},
+        {pattern: 'xmodule_js/common_static/coffee/spec/**/*.js'}
     ],
 
     fixtureFiles: [
         {pattern: 'js/fixtures/**/*.html'},
-        {pattern: 'common/templates/**/*.*'},
         {pattern: 'support/templates/**/*.*'},
         {pattern: 'teams/templates/**/*.*'},
         {pattern: 'templates/**/*.*'}
@@ -54,8 +48,5 @@ var files = {
 };
 
 module.exports = function (config) {
-    configModule.configure({
-        config: config,
-        files: files
-    });
+    configModule.configure(config, options);
 };
diff --git a/lms/static/karma_lms_coffee.conf.js b/lms/static/karma_lms_coffee.conf.js
index 5c7a6e13b7..a135c5ed3f 100644
--- a/lms/static/karma_lms_coffee.conf.js
+++ b/lms/static/karma_lms_coffee.conf.js
@@ -8,7 +8,11 @@
 var path = require('path');
 var configModule = require(path.join(__dirname, '../../common/static/common/js/karma.common.conf.js'));
 
-var files = {
+var options = {
+
+    useRequireJs: false,
+    includeCommonFiles: true,
+
     libraryFilesToInclude: [
         {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js', included: true},
         {pattern: 'js/spec/main_requirejs_coffee.js', included: true},
@@ -40,13 +44,11 @@ var files = {
     ],
 
     libraryFiles: [
-        {pattern: 'edx-pattern-library/js/**/*.js'},
-        {pattern: 'edx-ui-toolkit/js/**/*.js'},
         {pattern: 'xmodule_js/common_static/js/vendor/**/*.js'}
     ],
 
     sourceFiles: [
-        {pattern: 'coffee/src/**/*.js', included: true},
+        {pattern: 'coffee/src/**/*.js', included: true}
     ],
 
     specFiles: [
@@ -59,9 +61,5 @@ var files = {
 };
 
 module.exports = function (config) {
-    configModule.configure({
-        config: config,
-        files: files,
-        useRequireJs: false
-    });
+    configModule.configure(config, options);
 };

From a2dadeaaf3043b5634c6b8eda981e97f0e2cb2ae Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Thu, 5 May 2016 18:43:13 +0500
Subject: [PATCH 11/11] Added some documentation to Karma configuration files.

---
 cms/static/karma_cms.conf.js                  |  4 +++-
 cms/static/karma_cms_squire.conf.js           |  4 +++-
 .../xmodule/xmodule/js/karma_xmodule.conf.js  |  5 +++-
 common/static/common/js/karma.common.conf.js  | 24 +++++++++++++++++++
 .../static/common/js/spec/main_requirejs.js   |  2 ++
 common/static/karma_common.conf.js            |  5 +++-
 common/static/karma_common_requirejs.conf.js  |  4 +++-
 lms/static/karma_lms.conf.js                  |  5 +++-
 lms/static/karma_lms_coffee.conf.js           |  5 +++-
 9 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js
index 2a4cf11a0b..b2048623aa 100644
--- a/cms/static/karma_cms.conf.js
+++ b/cms/static/karma_cms.conf.js
@@ -1,5 +1,5 @@
 // Karma config for cms suite.
-// Docs in common/static/common/js/karma.common.conf.js
+// Docs and troubleshooting tips in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
@@ -13,6 +13,8 @@ var options = {
 
     libraryFiles: [],
 
+    // Make sure the patterns in sourceFiles and specFiles do not match the same file.
+    // Otherwise Istanbul which is used for coverage tracking will cause tests to not run.
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
         {pattern: 'js/**/!(*spec|djangojs).js'}
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index cd31114443..469a3891e8 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -1,5 +1,5 @@
 // Karma config for cms-squire suite.
-// Docs in common/static/common/js/karma.common.conf.js
+// Docs and troubleshooting tips in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
@@ -13,6 +13,8 @@ var options = {
 
     libraryFiles: [],
 
+    // Make sure the patterns in sourceFiles and specFiles do not match the same file.
+    // Otherwise Istanbul which is used for coverage tracking will cause tests to not run.
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
         {pattern: 'js/**/!(*spec|djangojs).js'}
diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
index 4631f2c48c..6ff01d6856 100644
--- a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
+++ b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
@@ -1,5 +1,5 @@
 // Karma config for xmodule suite.
-// Docs in common/static/common/js/karma.common.conf.js
+// Docs and troubleshooting tips in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
@@ -16,6 +16,7 @@ var options = {
         return pattern;
     },
 
+    // Avoid adding files to this list. Use RequireJS.
     libraryFilesToInclude: [
         {pattern: 'common_static/js/vendor/requirejs/require.js', included: true},
         {pattern: 'RequireJS-namespace-undefine.js', included: true},
@@ -55,6 +56,8 @@ var options = {
         {pattern: 'common_static/edx-pattern-library/js/**/*.js'}
     ],
 
+    // Make sure the patterns in sourceFiles and specFiles do not match the same file.
+    // Otherwise Istanbul which is used for coverage tracking will cause tests to not run.
     sourceFiles: [
         {pattern: 'src/xmodule.js', included: true, ignoreCoverage: true}, // To prevent getting instrumented twice.
         {pattern: 'src/**/*.js', included: true}
diff --git a/common/static/common/js/karma.common.conf.js b/common/static/common/js/karma.common.conf.js
index 110e8d3e95..173a7e5efe 100644
--- a/common/static/common/js/karma.common.conf.js
+++ b/common/static/common/js/karma.common.conf.js
@@ -19,6 +19,19 @@
 //
 // where `BROWSER` could be Chrome or Firefox.
 //
+//
+// Troubleshooting tips:
+//
+// If you get an error like: "TypeError: __cov_KBCc7ZI4xZm8W2BC5NQLDg.s is undefined",
+// that means the patterns in sourceFiles and specFiles are matching the same file.
+// This causes Istanbul, which is used for tracking coverage to instrument the file
+// multiple times.
+//
+//
+// If you see the error: "EMFILE, too many open files" that means the files pattern
+// that has been added is matching too many files. The glob library used by Karma
+// does not use graceful-fs and tries to read files simultaneously.
+//
 
 
 /* jshint node: true */
@@ -29,6 +42,7 @@ var path = require('path');
 var _ = require('underscore');
 var appRoot = path.join(__dirname, '../../../../');
 
+// Files which are needed by all lms/cms suites.
 var commonFiles = {
     libraryFiles: [
         {pattern: 'common/js/vendor/**/*.js'},
@@ -148,6 +162,12 @@ function junitSettings(config) {
     };
 }
 
+/**
+ * Return absolute path for files in common and xmodule_js symlink dirs.
+ * @param {String} appRoot
+ * @param {String} pattern
+ * @return {String}
+ */
 var defaultNormalizeFunc = function (appRoot, pattern) {
     if (pattern.match(/^common\/js/)) {
         pattern = path.join(appRoot, '/common/static/' + pattern);
@@ -339,6 +359,8 @@ var configure = function(config, options) {
       files.unshift({pattern: 'common/js/utils/require-serial.js', included: true});
     }
 
+    // Karma sets included=true by default.
+    // We set it to false by default because RequireJS should be used instead.
     files = setDefaults(files);
 
     // With nocache=true, Karma always serves the latest files from disk.
@@ -353,6 +375,8 @@ var configure = function(config, options) {
         )
     );
 
+    // If we give symlink paths to Istanbul, coverage for each path gets tracked
+    // separately. So we pass absolute paths to the karma-coverage preprocessor.
     var preprocessors = _.extend(
       {},
       options.preprocessors,
diff --git a/common/static/common/js/spec/main_requirejs.js b/common/static/common/js/spec/main_requirejs.js
index 15fc9ca853..55facc0937 100644
--- a/common/static/common/js/spec/main_requirejs.js
+++ b/common/static/common/js/spec/main_requirejs.js
@@ -181,6 +181,8 @@
         'common/js/spec_helpers/jasmine-waituntil'
     ];
 
+    // Jasmine has a global stack for creating a tree of specs. We need to load
+    // spec files one by one, otherwise some end up getting nested under others.
     window.requireSerial(specHelpers.concat(testFiles), function () {
         // start test run, once Require.js is done
         window.__karma__.start();
diff --git a/common/static/karma_common.conf.js b/common/static/karma_common.conf.js
index 7c2968e9f0..d592819644 100644
--- a/common/static/karma_common.conf.js
+++ b/common/static/karma_common.conf.js
@@ -1,5 +1,5 @@
 // Karma config for common suite.
-// Docs in common/static/common/js/karma.common.conf.js
+// Docs and troubleshooting tips in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
@@ -15,6 +15,7 @@ var options = {
         return path.join(appRoot, '/common/static/' + pattern);
     },
 
+    // Avoid adding files to this list. Use RequireJS.
     libraryFilesToInclude: [
         {pattern: 'coffee/src/ajax_prefix.js', included: true},
         {pattern: 'js/vendor/draggabilly.js', included: true},
@@ -45,6 +46,8 @@ var options = {
     libraryFiles: [
     ],
 
+    // Make sure the patterns in sourceFiles and specFiles do not match the same file.
+    // Otherwise Istanbul which is used for coverage tracking will cause tests to not run.
     sourceFiles: [
         {pattern: 'js/xblock/**/*.js', included: true},
         {pattern: 'coffee/src/**/*.js', included: true},
diff --git a/common/static/karma_common_requirejs.conf.js b/common/static/karma_common_requirejs.conf.js
index 9ccbed23fb..64d5f48f70 100644
--- a/common/static/karma_common_requirejs.conf.js
+++ b/common/static/karma_common_requirejs.conf.js
@@ -1,5 +1,5 @@
 // Karma config for common-requirejs suite.
-// Docs in common/static/common/js/karma.common.conf.js
+// Docs and troubleshooting tips in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
@@ -23,6 +23,8 @@ var options = {
         {pattern: 'js/vendor/**/*.js'}
     ],
 
+    // Make sure the patterns in sourceFiles and specFiles do not match the same file.
+    // Otherwise Istanbul which is used for coverage tracking will cause tests to not run.
     sourceFiles: [],
 
     specFiles: [
diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js
index 94526960ce..5acfe8b93f 100644
--- a/lms/static/karma_lms.conf.js
+++ b/lms/static/karma_lms.conf.js
@@ -1,5 +1,5 @@
 // Karma config for lms suite.
-// Docs in common/static/common/js/karma.common.conf.js
+// Docs and troubleshooting tips in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
@@ -11,6 +11,7 @@ var options = {
 
     includeCommonFiles: true,
 
+    // Avoid adding files to this list. Use RequireJS.
     libraryFilesToInclude: [
         {pattern: 'xmodule_js/common_static/js/vendor/jquery.event.drag-2.2.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/slick.core.js', included: true},
@@ -21,6 +22,8 @@ var options = {
         {pattern: 'js/RequireJS-namespace-undefine.js'}
     ],
 
+    // Make sure the patterns in sourceFiles and specFiles do not match the same file.
+    // Otherwise Istanbul which is used for coverage tracking will cause tests to not run.
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
         {pattern: 'js/**/!(*spec|djangojs).js'},
diff --git a/lms/static/karma_lms_coffee.conf.js b/lms/static/karma_lms_coffee.conf.js
index a135c5ed3f..29efa73a85 100644
--- a/lms/static/karma_lms_coffee.conf.js
+++ b/lms/static/karma_lms_coffee.conf.js
@@ -1,5 +1,5 @@
 // Karma config for lms-coffee suite.
-// Docs in common/static/common/js/karma.common.conf.js
+// Docs and troubleshooting tips in common/static/common/js/karma.common.conf.js
 
 /* jshint node: true */
 /*jshint -W079 */
@@ -13,6 +13,7 @@ var options = {
     useRequireJs: false,
     includeCommonFiles: true,
 
+    // Avoid adding files to this list. Use RequireJS.
     libraryFilesToInclude: [
         {pattern: 'xmodule_js/common_static/js/vendor/requirejs/require.js', included: true},
         {pattern: 'js/spec/main_requirejs_coffee.js', included: true},
@@ -47,6 +48,8 @@ var options = {
         {pattern: 'xmodule_js/common_static/js/vendor/**/*.js'}
     ],
 
+    // Make sure the patterns in sourceFiles and specFiles do not match the same file.
+    // Otherwise Istanbul which is used for coverage tracking will cause tests to not run.
     sourceFiles: [
         {pattern: 'coffee/src/**/*.js', included: true}
     ],