Merge pull request #7031 from edx/anton/video-fix-flaky-js-tests

[TNL-439]: Fix flaky jasmine tests.

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

@@ -217,44 +217,31 @@
                 expect(menuSubmenuItem).not.toHaveClass('is-opened');
             });
 
-            // Flaky-test resulting in timeout errors. Disabled 09/18/2014
-            // See TNL-439
-            xit('mouse left/right-clicking behaves as expected on play/pause menu item', function () {
+            it('mouse left/right-clicking behaves as expected on play/pause menu item', function () {
                 var menuItem = menuItems.first();
-                runs(function () {
+                spyOn(state.videoPlayer, 'play').andCallFake(function () {
+                    state.videoControl.isPlaying = true;
+                    state.el.trigger('play');
+                });
+                spyOn(state.videoPlayer, 'pause').andCallFake(function () {
+                    state.videoControl.isPlaying = false;
+                    state.el.trigger('pause');
+                });
                 // Left-click on play
                 menuItem.click();
-                });
-
-                waitsFor(function () {
-                    return state.videoPlayer.isPlaying();
-                }, 'video to start playing', 200);
-
-                runs(function () {
+                expect(state.videoPlayer.play).toHaveBeenCalled();
                 expect(menuItem).toHaveText('Pause');
                 openMenu();
                 // Left-click on pause
                 menuItem.click();
-                });
-
-                waitsFor(function () {
-                    return !state.videoPlayer.isPlaying();
-                }, 'video to start playing', 200);
-
-                runs(function () {
+                expect(state.videoPlayer.pause).toHaveBeenCalled();
                 expect(menuItem).toHaveText('Play');
+                state.videoPlayer.play.reset();
                 // Right-click on play
                 menuItem.trigger('contextmenu');
-                });
-
-                waitsFor(function () {
-                    return state.videoPlayer.isPlaying();
-                }, 'video to start playing', 200);
-
-                runs(function () {
+                expect(state.videoPlayer.play).toHaveBeenCalled();
                 expect(menuItem).toHaveText('Pause');
             });
-            });
 
             it('mouse left/right-clicking behaves as expected on mute/unmute menu item', function () {
                 var menuItem = menuItems.eq(1);