diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js index 386170b57e..5785cf8446 100644 --- a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js +++ b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js @@ -59,6 +59,12 @@ var files = [ {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}, // Paths to source JavaScript files {pattern: 'src/xmodule.js', included: true, nocache: true}, diff --git a/common/lib/xmodule/xmodule/js/spec/main_requirejs.js b/common/lib/xmodule/xmodule/js/spec/main_requirejs.js index 1716ee3540..a57497f8c8 100644 --- a/common/lib/xmodule/xmodule/js/spec/main_requirejs.js +++ b/common/lib/xmodule/xmodule/js/spec/main_requirejs.js @@ -3,10 +3,10 @@ baseUrl: '/base/', paths: { "moment": "common_static/js/vendor/moment.min", - "modernizr": "xmodule/include/common_static/edx-pattern-library/js/modernizr-custom", - "afontgarde": "xmodule/include/common_static/edx-pattern-library/js/afontgarde", - "edxicons": "xmodule/include/common_static/edx-pattern-library/js/edx-icons", - "draggabilly": "xmodule/include/common_static/js/vendor/draggabilly" + "modernizr": "common_static/edx-pattern-library/js/modernizr-custom", + "afontgarde": "common_static/edx-pattern-library/js/afontgarde", + "edxicons": "common_static/edx-pattern-library/js/edx-icons", + "draggabilly": "common_static/js/vendor/draggabilly" }, "moment": { exports: "moment" diff --git a/common/static/common/js/karma.common.conf.js b/common/static/common/js/karma.common.conf.js index a474399e26..385acd15ad 100644 --- a/common/static/common/js/karma.common.conf.js +++ b/common/static/common/js/karma.common.conf.js @@ -189,7 +189,7 @@ var getConfig = function (config, useRequireJs) { // level of logging /* possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG */ - logLevel: config.LOG_DEBUG, + logLevel: config.LOG_INFO, // enable / disable watching file and executing tests whenever any file changes diff --git a/common/static/common/js/spec/components/tabbed_view_spec.js b/common/static/common/js/spec/components/tabbed_view_spec.js index edf9319d0d..f28ce1de8e 100644 --- a/common/static/common/js/spec/components/tabbed_view_spec.js +++ b/common/static/common/js/spec/components/tabbed_view_spec.js @@ -47,7 +47,7 @@ // will cause tests to fail, so we'll instead // make _.defer() immediately invoke its // argument. - spyOn(_, 'defer').andCallFake(function (func) { + spyOn(_, 'defer').and.callFake(function (func) { func(); }); }); @@ -88,7 +88,7 @@ describe('history', function() { beforeEach(function () { - spyOn(Backbone.history, 'navigate').andCallThrough(); + spyOn(Backbone.history, 'navigate').and.callThrough(); view = new TabbedView({ tabs: [{ url: 'test 1', diff --git a/common/static/common/js/spec/main_requirejs.js b/common/static/common/js/spec/main_requirejs.js index ec2930ce8b..1601d8a0a0 100644 --- a/common/static/common/js/spec/main_requirejs.js +++ b/common/static/common/js/spec/main_requirejs.js @@ -37,8 +37,7 @@ 'draggabilly': 'js/vendor/draggabilly', 'jasmine-stealth': 'js/libs/jasmine-stealth', 'jasmine-waituntil': 'js/libs/jasmine-waituntil', - 'jasmine-extensions': 'js/libs/jasmine-extensions', - 'URI': 'js/vendor/URI.min' + 'jasmine-extensions': 'js/libs/jasmine-extensions' }, shim: { 'gettext': { diff --git a/common/static/karma_common.conf.js b/common/static/karma_common.conf.js index 7d4f81b81c..7fd26c8022 100644 --- a/common/static/karma_common.conf.js +++ b/common/static/karma_common.conf.js @@ -47,6 +47,12 @@ var files = [ {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}, // Paths to source JavaScript files {pattern: 'js/xblock/**/*.js', included: true, nocache: true},