Merge pull request #4261 from edx/ammar/video-tests-refactoring

Refactor Bok-Choy LMS Video Tests

common/test/acceptance/tests/video/test_video_times.py

@@ -27,11 +27,11 @@ class VideoTimesTest(VideoBaseTest):
         # go to video
         self.navigate_to_video()
 
-        self.assertEqual(self.video.position(), '0:10')
+        self.assertEqual(self.video.position, '0:10')
 
         self.video.click_player_button('play')
 
-        self.assertGreaterEqual(int(self.video.position().split(':')[1]), 10)
+        self.assertGreaterEqual(int(self.video.position.split(':')[1]), 10)
 
     def test_video_end_time_with_default_start_time(self):
         """
@@ -53,7 +53,7 @@ class VideoTimesTest(VideoBaseTest):
         # wait until video stop playing
         self.video.wait_for_state('pause')
 
-        self.assertEqual(self.video.position(), '0:02')
+        self.assertEqual(self.video.position, '0:02')
 
     def test_video_end_time_wo_default_start_time(self):
         """
@@ -78,7 +78,7 @@ class VideoTimesTest(VideoBaseTest):
         # wait until video stop playing
         self.video.wait_for_state('pause')
 
-        self.assertEqual(self.video.position(), '1:00')
+        self.assertEqual(self.video.position, '1:00')
 
     def test_video_start_time_and_end_time(self):
         """
@@ -96,14 +96,14 @@ class VideoTimesTest(VideoBaseTest):
         # go to video
         self.navigate_to_video()
 
-        self.assertEqual(self.video.position(), '0:10')
+        self.assertEqual(self.video.position, '0:10')
 
         self.video.click_player_button('play')
 
         # wait until video stop playing
         self.video.wait_for_state('pause')
 
-        self.assertEqual(self.video.position(), '0:12')
+        self.assertEqual(self.video.position, '0:12')
 
     @skip("Intermittently fails 03 June 2014")
     def test_video_end_time_and_finish_time(self):
@@ -135,14 +135,14 @@ class VideoTimesTest(VideoBaseTest):
         # wait until video stop playing
         self.video.wait_for_state('pause')
 
-        self.assertEqual(self.video.position(), '1:42')
+        self.assertEqual(self.video.position, '1:42')
 
         self.video.click_player_button('play')
 
         # wait until video stop playing
         self.video.wait_for_state('finished')
 
-        self.assertIn(self.video.position(), ['1:54', '1:55'])
+        self.assertIn(self.video.position, ['1:54', '1:55'])
 
     def test_video_end_time_with_seek(self):
         """
@@ -167,7 +167,7 @@ class VideoTimesTest(VideoBaseTest):
         # wait until video stop playing
         self.video.wait_for_state('pause')
 
-        self.assertEqual(self.video.position(), '0:32')
+        self.assertEqual(self.video.position, '0:32')
 
     def test_video_finish_time_with_seek(self):
         """
@@ -198,4 +198,4 @@ class VideoTimesTest(VideoBaseTest):
         # wait until video stop playing
         self.video.wait_for_state('finished')
 
-        self.assertIn(self.video.position(), ['1:54', '1:55'])
+        self.assertIn(self.video.position, ['1:54', '1:55'])

requirements/edx/github.txt

@@ -24,7 +24,7 @@
 -e git+https://github.com/edx/django-waffle.git@823a102e48#egg=django-waffle
 -e git+https://github.com/edx/event-tracking.git@0.1.0#egg=event-tracking
 -e git+https://github.com/edx/edx-analytics-api-client.git@0.1.0#egg=analytics-client
--e git+https://github.com/edx/bok-choy.git@821d3b0ac742c204a93d802a8732be024a0bce22#egg=bok_choy
+-e git+https://github.com/edx/bok-choy.git@feb61863967134a378a7c912576cb31a94ba02bf#egg=bok_choy
 -e git+https://github.com/edx-solutions/django-splash.git@9965a53c269666a30bb4e2b3f6037c138aef2a55#egg=django-splash
 -e git+https://github.com/edx/acid-block.git@459aff7b63db8f2c5decd1755706c1a64fb4ebb1#egg=acid-xblock
 -e git+https://github.com/edx/edx-ora2.git@release-2014-07-28T12.09#egg=edx-ora2