diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 124e22dd5ab1f138d5208c745c793f4c93500dc7..0a5b25f4699dd8f1b21c6f113c1b7431c3f5cd11 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,8 @@ These are notable changes in edx-platform. This is a rolling list of changes, in roughly chronological order, most recent first. Add your entries at or near the top. Include a label indicating the component affected. +Blades: Enabled several Video Jasmine tests. BLD-463. + Blades: Put 2nd "Hide output" button at top of test box & increase text size for code response questions. BLD-126. diff --git a/common/lib/xmodule/xmodule/js/spec/video/general_spec.js b/common/lib/xmodule/xmodule/js/spec/video/general_spec.js index 8921e819e4fcdd7e32968fe7cb018081295a277f..2400830302591064a2ce9b194f8249d31a0a09b6 100644 --- a/common/lib/xmodule/xmodule/js/spec/video/general_spec.js +++ b/common/lib/xmodule/xmodule/js/spec/video/general_spec.js @@ -271,7 +271,17 @@ }); // Disabled 10/29/13 due to flakiness in master - xdescribe('multiple YT on page', function () { + // + // Update: Turned on test back again. Passing locally and on + // Jenkins in a large number of runs. + // + // Will observe for a little while to see if any failures arise. + // Most probable cause of test passing is: + // + // https://github.com/edx/edx-platform/pull/1642 + // + // : ) + describe('multiple YT on page', function () { var state1, state2, state3; beforeEach(function () { diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js index 29f4567c8a1b479223aaa0fc590ec1ba273262f8..acc7bdf1fb5dedce98ead3a4013436dc7e857851 100644 --- a/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js +++ b/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js @@ -457,7 +457,17 @@ }); // Disabled 10/25/13 due to flakiness in master - xit('scroll caption to new position', function () { + // + // Update: Turned on test back again. Passing locally and on + // Jenkins in a large number of runs. + // + // Will observe for a little while to see if any failures arise. + // Most probable cause of test passing is: + // + // https://github.com/edx/edx-platform/pull/1642 + // + // : ) + it('scroll caption to new position', function () { expect($.fn.scrollTo).toHaveBeenCalled(); }); }); @@ -538,7 +548,17 @@ }); // Disabled 10/23/13 due to flakiness in master - xdescribe('scrollCaption', function () { + // + // Update: Turned on test back again. Passing locally and on + // Jenkins in a large number of runs. + // + // Will observe for a little while to see if any failures arise. + // Most probable cause of test passing is: + // + // https://github.com/edx/edx-platform/pull/1642 + // + // : ) + describe('scrollCaption', function () { beforeEach(function () { initialize(); }); @@ -683,7 +703,17 @@ }); // Test turned off due to flakiness (30.10.2013). - xit('scroll the caption', function () { + // + // Update: Turned on test back again. Passing locally and on + // Jenkins in a large number of runs. + // + // Will observe for a little while to see if any failures arise. + // Most probable cause of test passing is: + // + // https://github.com/edx/edx-platform/pull/1642 + // + // : ) + it('scroll the caption', function () { // After transcripts are shown, and the video plays for a // bit. jasmine.Clock.tick(1000); diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js index e3a4a47fd02af196400fe37e977b595e4537cdae..b8244d2e99876adca1364c5fadfac2b969c15258 100644 --- a/common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js +++ b/common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js @@ -154,7 +154,17 @@ }); // Turned off test due to flakiness (30.10.2013). - xit('trigger seek event', function() { + // + // Update: Turned on test back again. Passing locally and on + // Jenkins in a large number of runs. + // + // Will observe for a little while to see if any failures arise. + // Most probable cause of test passing is: + // + // https://github.com/edx/edx-platform/pull/1642 + // + // : ) + it('trigger seek event', function() { runs(function () { videoProgressSlider.onSlide( jQuery.Event('slide'), { value: 20 } @@ -220,7 +230,17 @@ }); // Turned off test due to flakiness (30.10.2013). - xit('trigger seek event', function() { + // + // Update: Turned on test back again. Passing locally and on + // Jenkins in a large number of runs. + // + // Will observe for a little while to see if any failures arise. + // Most probable cause of test passing is: + // + // https://github.com/edx/edx-platform/pull/1642 + // + // : ) + it('trigger seek event', function() { runs(function () { videoProgressSlider.onStop( jQuery.Event('stop'), { value: 20 }