From c219be5e757aa45f73f7d1917d67034e38343744 Mon Sep 17 00:00:00 2001 From: Jesse Zoldak Date: Tue, 7 Jul 2015 16:06:41 -0400 Subject: [PATCH 1/3] Remove unused references to AjaxHelpers --- cms/static/js/spec/video/file_uploader_editor_spec.js | 4 ++-- cms/static/js/spec/video/translations_editor_spec.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cms/static/js/spec/video/file_uploader_editor_spec.js b/cms/static/js/spec/video/file_uploader_editor_spec.js index a7eb90040f..c6d7f08a37 100644 --- a/cms/static/js/spec/video/file_uploader_editor_spec.js +++ b/cms/static/js/spec/video/file_uploader_editor_spec.js @@ -1,8 +1,8 @@ define( [ - 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers', 'squire' + 'jquery', 'underscore', 'squire' ], -function ($, _, AjaxHelpers, Squire) { +function ($, _, Squire) { 'use strict'; describe('FileUploader', function () { var FileUploaderTemplate = readFixtures( diff --git a/cms/static/js/spec/video/translations_editor_spec.js b/cms/static/js/spec/video/translations_editor_spec.js index 48c273a3b6..36879df06d 100644 --- a/cms/static/js/spec/video/translations_editor_spec.js +++ b/cms/static/js/spec/video/translations_editor_spec.js @@ -1,8 +1,8 @@ define( [ - 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers', 'squire' + 'jquery', 'underscore', 'squire' ], -function ($, _, AjaxHelpers, Squire) { +function ($, _, Squire) { 'use strict'; // TODO: fix BLD-1100 Disabled due to intermittent failure on master and in PR builds xdescribe('VideoTranslations', function () { From 1e5fe3a3a79e37db9a5d5299a3fad768fff14e34 Mon Sep 17 00:00:00 2001 From: Jesse Zoldak Date: Tue, 7 Jul 2015 16:07:56 -0400 Subject: [PATCH 2/3] Use the correct sinon request pattern to avoid flaky tests --- cms/static/coffee/spec/views/course_info_spec.coffee | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cms/static/coffee/spec/views/course_info_spec.coffee b/cms/static/coffee/spec/views/course_info_spec.coffee index ebcb576e1b..81d213c4bc 100644 --- a/cms/static/coffee/spec/views/course_info_spec.coffee +++ b/cms/static/coffee/spec/views/course_info_spec.coffee @@ -167,22 +167,23 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model @courseInfoEdit.render() @event = {preventDefault : () -> 'no op'} @courseInfoEdit.onNew(@event) - @requests = AjaxHelpers["requests"](this) it "shows push notification checkbox as selected by default", -> expect(@courseInfoEdit.$el.find('.toggle-checkbox')).toBeChecked() it "sends correct default value for push_notification_selected", -> + requests = AjaxHelpers.requests(this); @courseInfoEdit.$el.find('.save-button').click() - requestSent = JSON.parse(@requests[@requests.length - 1].requestBody) + requestSent = JSON.parse(requests[requests.length - 1].requestBody) expect(requestSent.push_notification_selected).toEqual(true) it "sends correct value for push_notification_selected when it is unselected", -> + requests = AjaxHelpers.requests(this); # unselect push notification @courseInfoEdit.$el.find('.toggle-checkbox').attr('checked', false); @courseInfoEdit.$el.find('.save-button').click() - requestSent = JSON.parse(@requests[@requests.length - 1].requestBody) + requestSent = JSON.parse(requests[requests.length - 1].requestBody) expect(requestSent.push_notification_selected).toEqual(false) describe "Course Handouts", -> From de25880c10a63ef3a25c11eff9a0b735f89a405f Mon Sep 17 00:00:00 2001 From: Jesse Zoldak Date: Tue, 7 Jul 2015 16:24:04 -0400 Subject: [PATCH 3/3] Disable test specs that use old flaky sinon pattern --- cms/static/js/spec/video/transcripts/videolist_spec.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cms/static/js/spec/video/transcripts/videolist_spec.js b/cms/static/js/spec/video/transcripts/videolist_spec.js index b13e81040e..411f32201d 100644 --- a/cms/static/js/spec/video/transcripts/videolist_spec.js +++ b/cms/static/js/spec/video/transcripts/videolist_spec.js @@ -8,7 +8,9 @@ define( ], function ($, _, Utils, VideoList, MetadataModel, AbstractEditor, sinon) { 'use strict'; - describe('CMS.Views.Metadata.VideoList', function () { + // TODO: reenable these specs, using AjaxHelpers and the correct pattern + // to avoid flakiness. See TNL-2689. + xdescribe('CMS.Views.Metadata.VideoList', function () { var videoListEntryTemplate = readFixtures( 'video/transcripts/metadata-videolist-entry.underscore' ),