From c728c9d30a201c879aec9bc5faf9e0da03404514 Mon Sep 17 00:00:00 2001 From: Usman Khalid <2200617@gmail.com> Date: Wed, 20 Apr 2016 20:07:38 +0500 Subject: [PATCH] Post-rebase fixes. --- cms/static/coffee/spec/main_squire.coffee | 4 ++-- .../coffee/spec/views/course_info_spec.coffee | 22 ++++++++++++------- cms/static/karma_cms.conf.js | 9 ++++++-- cms/static/karma_cms_squire.conf.js | 2 +- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/cms/static/coffee/spec/main_squire.coffee b/cms/static/coffee/spec/main_squire.coffee index f82251f597..1a537b4d64 100644 --- a/cms/static/coffee/spec/main_squire.coffee +++ b/cms/static/coffee/spec/main_squire.coffee @@ -24,8 +24,8 @@ requirejs.config({ "datepair": "xmodule_js/common_static/js/vendor/timepicker/datepair", "date": "xmodule_js/common_static/js/vendor/date", "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", + "underscore": "common/js/vendor/underscore", + "underscore.string": "common/js/vendor/underscore.string", "backbone": "xmodule_js/common_static/js/vendor/backbone-min", "backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min", "backbone.paginator": "xmodule_js/common_static/js/vendor/backbone.paginator.min", diff --git a/cms/static/coffee/spec/views/course_info_spec.coffee b/cms/static/coffee/spec/views/course_info_spec.coffee index 2b823699d8..344c95fb47 100644 --- a/cms/static/coffee/spec/views/course_info_spec.coffee +++ b/cms/static/coffee/spec/views/course_info_spec.coffee @@ -94,6 +94,20 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model previewContents = @courseInfoEdit.$el.find('.update-contents').html() expect(previewContents).toEqual('existing update') + @testInvalidDateValue = (value) -> + @courseInfoEdit.onNew(@event) + expect(@courseInfoEdit.$el.find('.save-button').hasClass("is-disabled")).toEqual(false) + @courseInfoEdit.$el.find('input.date').val(value).trigger("change") + courseInfoEdit = @courseInfoEdit + jasmine.waitUntil(-> + courseInfoEdit.$el.find('.save-button').hasClass('is-disabled') == true + ).then -> + courseInfoEdit.$el.find('input.date').val('01/01/16').trigger 'change' + jasmine.waitUntil(-> + courseInfoEdit.$el.find('.save-button').hasClass('is-disabled') == false + ).always done + return + cancelEditingUpdate = (update, modalCover, useCancelButton) -> if useCancelButton update.$el.find('.cancel-button').click() @@ -153,14 +167,6 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model it "does not remove existing course info on click outside modal", -> @cancelExistingCourseInfo(false) - @testInvalidDateValue: (value) -> - @courseInfoEdit.onNew(@event) - expect(@courseInfoEdit.$el.find('.save-button').hasClass("is-disabled")).toEqual(false) - @courseInfoEdit.$el.find('input.date').val(value).trigger("change") - expect(@courseInfoEdit.$el.find('.save-button').hasClass("is-disabled")).toEqual(true) - @courseInfoEdit.$el.find('input.date').val("01/01/16").trigger("change") - expect(@courseInfoEdit.$el.find('.save-button').hasClass("is-disabled")).toEqual(false) - it "does not allow updates to be saved with an invalid date", -> @testInvalidDateValue("Marchtober 40, 2048") diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js index 5c5d2fe395..1052a9965e 100644 --- a/cms/static/karma_cms.conf.js +++ b/cms/static/karma_cms.conf.js @@ -34,7 +34,7 @@ var files = [ {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/js/vendor/underscore.string.min.js', included: false}, + {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js', included: false}, {pattern: 'xmodule_js/common_static/js/vendor/backbone-min.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}, @@ -53,7 +53,7 @@ var files = [ {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.pkgd.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}, @@ -77,6 +77,11 @@ var files = [ {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}, + // Paths to source JavaScript files {pattern: 'xmodule_js/common_static/js/libs/jasmine-extensions.js', included: true, nocache: true}, {pattern: 'coffee/src/**/*.js', included: false, nocache: true}, diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js index 501133ae56..ed0a0b6f88 100644 --- a/cms/static/karma_cms_squire.conf.js +++ b/cms/static/karma_cms_squire.conf.js @@ -34,7 +34,7 @@ var files = [ {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/js/vendor/underscore.string.min.js', included: false}, + {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js', included: false}, {pattern: 'xmodule_js/common_static/js/vendor/backbone-min.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},