Merge pull request #2054 from edx/anton/disable-js-unit-test

Disable js unit test due to flakiness.

common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js

@@ -134,7 +134,8 @@
                 spyOn(videoPlayer, 'onSlideSeek').andCallThrough();
             });
 
-            it('freeze the slider', function() {
+            // Disabled 12/30/13 due to flakiness in master
+            xit('freeze the slider', function() {
                 videoProgressSlider.onSlide(
                     jQuery.Event('slide'), { value: 20 }
                 );
@@ -142,7 +143,8 @@
                 expect(videoProgressSlider.frozen).toBeTruthy();
             });
 
-            it('trigger seek event', function() {
+            // Disabled 12/30/13 due to flakiness in master
+            xit('trigger seek event', function() {
                 videoProgressSlider.onSlide(
                     jQuery.Event('slide'), { value: 20 }
                 );
@@ -160,7 +162,8 @@
                 spyOn(videoPlayer, 'onSlideSeek').andCallThrough();
             });
 
-            it('freeze the slider', function() {
+            // Disabled 12/30/13 due to flakiness in master
+            xit('freeze the slider', function() {
                 videoProgressSlider.onStop(
                     jQuery.Event('stop'), { value: 20 }
                 );
@@ -168,7 +171,8 @@
                 expect(videoProgressSlider.frozen).toBeTruthy();
             });
 
-            it('trigger seek event', function() {
+            // Disabled 12/30/13 due to flakiness in master
+            xit('trigger seek event', function() {
                 videoProgressSlider.onStop(
                     jQuery.Event('stop'), { value: 20 }
                 );
@@ -176,7 +180,8 @@
                 expect(videoPlayer.onSlideSeek).toHaveBeenCalled();
             });
 
-            it('set timeout to unfreeze the slider', function() {
+            // Disabled 12/30/13 due to flakiness in master
+            xit('set timeout to unfreeze the slider', function() {
                 videoProgressSlider.onStop(
                     jQuery.Event('stop'), { value: 20 }
                 );