diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee index d5d9980b47..f761fbb0e9 100644 --- a/cms/static/coffee/spec/main.coffee +++ b/cms/static/coffee/spec/main.coffee @@ -231,9 +231,9 @@ testFiles = [ "coffee/spec/views/upload_spec", "js/spec/video/transcripts/utils_spec", "js/spec/video/transcripts/editor_spec", -# "js/spec/video/transcripts/videolist_spec", -# "js/spec/video/transcripts/message_manager_spec", -# "js/spec/video/transcripts/file_uploader_spec", + "js/spec/video/transcripts/videolist_spec", + "js/spec/video/transcripts/message_manager_spec", + "js/spec/video/transcripts/file_uploader_spec", "js/spec/models/component_template_spec", "js/spec/models/explicit_url_spec", "js/spec/models/xblock_info_spec", diff --git a/cms/static/js/spec/video/transcripts/file_uploader_spec.js b/cms/static/js/spec/video/transcripts/file_uploader_spec.js index 41f159ad1a..fd899c76f8 100644 --- a/cms/static/js/spec/video/transcripts/file_uploader_spec.js +++ b/cms/static/js/spec/video/transcripts/file_uploader_spec.js @@ -5,8 +5,9 @@ define( "xmodule", "jquery.form" ], function ($, _, Utils, FileUploader) { - // TODO: fix TNL-559 Intermittent failures of Transcript FileUploader JS tests - xdescribe('Transcripts.FileUploader', function () { + 'use strict'; + + describe('Transcripts.FileUploader', function () { var videoListEntryTemplate = readFixtures( 'video/transcripts/metadata-videolist-entry.underscore' ), @@ -67,10 +68,9 @@ function ($, _, Utils, FileUploader) { it('Template doesn\'t exist', function () { spyOn(console, 'error'); view.uploadTpl = ''; - view.render(); - expect(console.error).toHaveBeenCalled(); expect(view.render).not.toThrow(); + expect(console.error).toHaveBeenCalled(); expect(_.template).not.toHaveBeenCalled(); }); @@ -78,8 +78,6 @@ function ($, _, Utils, FileUploader) { function () { $('.transcripts-file-uploader').remove(); - view.render(); - expect(view.render).not.toThrow(); expect(_.template).not.toHaveBeenCalled(); } @@ -93,8 +91,6 @@ function ($, _, Utils, FileUploader) { }).join(', '); view.validFileExtensions = validFileExtensions; - view.render(); - expect(view.render).not.toThrow(); expect(_.template).toHaveBeenCalled(); $.each(elList, function(index, el) { diff --git a/cms/static/js/spec/video/transcripts/message_manager_spec.js b/cms/static/js/spec/video/transcripts/message_manager_spec.js index 2324f6871f..4019a44aea 100644 --- a/cms/static/js/spec/video/transcripts/message_manager_spec.js +++ b/cms/static/js/spec/video/transcripts/message_manager_spec.js @@ -6,9 +6,9 @@ define( "xmodule" ], function ($, _, Utils, MessageManager, FileUploader, sinon) { + 'use strict'; - // TODO: fix TNL-559 Intermittent failures of Transcript FileUploader JS tests - xdescribe('Transcripts.MessageManager', function () { + describe('Transcripts.MessageManager', function () { var videoListEntryTemplate = readFixtures( 'video/transcripts/metadata-videolist-entry.underscore' ), @@ -46,7 +46,7 @@ function ($, _, Utils, MessageManager, FileUploader, sinon) { ); $container = $('#metadata-videolist-entry'); - spyOn(fileUploader, 'initialize'); + spyOn(fileUploader, 'initialize').and.callThrough(); spyOn(console, 'error'); spyOn(Utils.Storage, 'set'); @@ -66,12 +66,11 @@ function ($, _, Utils, MessageManager, FileUploader, sinon) { }); }); - // Disabled 2/6/14 after intermittent failure in master describe('Render', function () { beforeEach(function () { spyOn(_,'template').and.callThrough(); - spyOn(fileUploader, 'render'); + spyOn(view.fileUploader, 'render'); }); it('Template doesn\'t exist', function () { @@ -81,7 +80,7 @@ function ($, _, Utils, MessageManager, FileUploader, sinon) { expect(_.template).not.toHaveBeenCalled(); expect(view.$el.find('.transcripts-status')) .toHaveClass('is-invisible'); - expect(fileUploader.render).not.toHaveBeenCalled(); + expect(view.fileUploader.render).not.toHaveBeenCalled(); }); it('All works okay if correct data is passed', function () { @@ -90,7 +89,7 @@ function ($, _, Utils, MessageManager, FileUploader, sinon) { expect(console.error).not.toHaveBeenCalled(); expect(_.template).toHaveBeenCalled(); expect(view.$el).not.toHaveClass('is-invisible'); - expect(fileUploader.render).toHaveBeenCalled(); + expect(view.fileUploader.render).toHaveBeenCalled(); }); }); diff --git a/cms/static/js/views/video/transcripts/file_uploader.js b/cms/static/js/views/video/transcripts/file_uploader.js index 13f95dc039..e0e1842e04 100644 --- a/cms/static/js/views/video/transcripts/file_uploader.js +++ b/cms/static/js/views/video/transcripts/file_uploader.js @@ -19,7 +19,8 @@ function($, Backbone, _, Utils) { initialize: function (options) { _.bindAll(this, - 'changeHandler', 'clickHandler', 'xhrResetProgressBar', 'xhrProgressHandler', 'xhrCompleteHandler' + 'changeHandler', 'clickHandler', 'xhrResetProgressBar', 'xhrProgressHandler', 'xhrCompleteHandler', + 'render' ); this.options = _.extend({}, options); this.file = false;