Skip to content

E
edx-platform
Commit bf94083d by Will Daly
Options

Revert PR 1711; disabling JS tests again

parent 304ccc91
Showing with 12 additions and 74 deletions
CHANGELOG.rst
...@@ -5,8 +5,6 @@ These are notable changes in edx-platform. This is a rolling list of changes, ...@@ -5,8 +5,6 @@ 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 in roughly chronological order, most recent first. Add your entries at or near
the top. Include a label indicating the component affected. the top. Include a label indicating the component affected.
Blades: Enabled several Video Jasmine tests. BLD-463.
Studio: Continued modification of Studio pages to follow a RESTful framework. Studio: Continued modification of Studio pages to follow a RESTful framework.
includes Settings pages, edit page for Subsection and Unit, and interfaces includes Settings pages, edit page for Subsection and Unit, and interfaces
for updating xblocks (xmodules) and getting their editing HTML. for updating xblocks (xmodules) and getting their editing HTML.
......
common/lib/xmodule/xmodule/js/spec/video/general_spec.js
...@@ -270,18 +270,8 @@ ...@@ -270,18 +270,8 @@
} }
}); });
// Disabled 10/29/13 due to flakiness in master // Disabled 11/25/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; var state1, state2, state3;
beforeEach(function () { beforeEach(function () {
......
common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
...@@ -456,18 +456,8 @@ ...@@ -456,18 +456,8 @@
expect(videoCaption.currentIndex).toEqual(5); expect(videoCaption.currentIndex).toEqual(5);
}); });
// Disabled 10/25/13 due to flakiness in master // Disabled 11/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(); expect($.fn.scrollTo).toHaveBeenCalled();
}); });
}); });
...@@ -547,18 +537,8 @@ ...@@ -547,18 +537,8 @@
}); });
}); });
// Disabled 10/23/13 due to flakiness in master // Disabled 11/25/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 () { beforeEach(function () {
initialize(); initialize();
}); });
...@@ -702,18 +682,8 @@ ...@@ -702,18 +682,8 @@
.toHaveAttr('title', 'Turn off captions'); .toHaveAttr('title', 'Turn off captions');
}); });
// Test turned off due to flakiness (30.10.2013). // Test turned off due to flakiness (11/25/13)
// 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 // After transcripts are shown, and the video plays for a
// bit. // bit.
jasmine.Clock.tick(1000); jasmine.Clock.tick(1000);
......
common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js
...@@ -153,18 +153,8 @@ ...@@ -153,18 +153,8 @@
}); });
}); });
// Turned off test due to flakiness (30.10.2013). // Turned off test due to flakiness (11/25/13)
// 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 () { runs(function () {
videoProgressSlider.onSlide( videoProgressSlider.onSlide(
jQuery.Event('slide'), { value: 20 } jQuery.Event('slide'), { value: 20 }
...@@ -229,18 +219,8 @@ ...@@ -229,18 +219,8 @@
}); });
}); });
// Turned off test due to flakiness (30.10.2013). // Turned off test due to flakiness (11/25/13)
// 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 () { runs(function () {
videoProgressSlider.onStop( videoProgressSlider.onStop(
jQuery.Event('stop'), { value: 20 } jQuery.Event('stop'), { value: 20 }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment