Set included=false by default because we want to move towards RequireJs.

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
     });
 };
-

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}
     ]
 };
 

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}
     ]
 };
 

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]; }
         )

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'}
     ]
 };
 

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}
     ]
 };
 

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}
     ]
 };