Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify paths patterns in karma config files.

Browse Source 
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.
This commit is contained in:
Usman Khalid
2016-05-03 23:56:24 +05:00
parent 713c79e0aa
commit 15acec2054
10 changed files with 150 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
cms/static/karma_cms.conf.js
View File

@@ -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: [

61
cms/static/karma_cms_squire.conf.js
View File

@@ -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: [