Merge pull request #17455 from edx/estute/jenkins-ff-57-b

Support firefox 59 upgrade for CI and local testing

AUTHORS

@@ -287,3 +287,5 @@ Shirley He <she@edx.org>
 Po Tsui <potsui@stanford.edu>
 Rabia Iftikhar <rabiaiftikhar2392@gmail.com>
 Matt Tuchfarber <mtuchfarber@edx.org>
+Stuart Young <syoung@edx.org>
+Michael Youngstrom <myoungstrom@edx.org>

common/test/acceptance/pages/lms/learner_profile.py

@@ -281,8 +281,6 @@ class LearnerProfilePage(FieldsMixin, PageObject):
         self.browser.execute_script('$(".upload-button-input").css("opacity",1);')
 
         self.wait_for_element_visibility('.upload-button-input', "upload button is visible")
-        self.browser.execute_script('$(".upload-submit").show();')
-        self.q(css='.upload-submit').first.click()
         self.q(css='.upload-button-input').results[0].send_keys(file_path)
         self.wait_for_ajax()
 

common/test/acceptance/pages/studio/container.py

@@ -192,6 +192,7 @@ class ContainerPage(PageObject, HelpMixin):
         """
         Discards draft changes (which will then re-render the page).
         """
+        self.scroll_to_element('a.action-discard')
         click_css(self, 'a.action-discard', 0, require_notification=False)
         confirm_prompt(self)
         self.wait_for_ajax()

common/test/acceptance/pages/studio/index.py

@@ -219,9 +219,8 @@ class DashboardPage(PageObject, HelpMixin):
         """
         # Workaround Selenium/Firefox bug: `.text` property is broken on invisible elements
         tab_selector = '#course-index-tabs .{} a'.format('archived-courses-tab' if archived else 'courses-tab')
-        course_tab_link = self.q(css=tab_selector)
-        if course_tab_link:
-            course_tab_link.click()
+        self.wait_for_element_presence(tab_selector, "Courses Tab")
+        self.q(css=tab_selector).click()
         div2info = lambda element: {
             'name': element.find_element_by_css_selector('.course-title').text,
             'org': element.find_element_by_css_selector('.course-org .value').text,

common/test/acceptance/pages/studio/overview.py

@@ -503,6 +503,7 @@ class CourseOutlinePage(CoursePage, CourseOutlineContainer):
         Clicks the "View Live" link and switches to the new tab
         """
         click_css(self, '.view-live-button', require_notification=False)
+        self.wait_for_page()
         self.browser.switch_to_window(self.browser.window_handles[-1])
 
     def section(self, title):

common/test/acceptance/tests/helpers.py

@@ -737,9 +737,6 @@ class AcceptanceTest(WebAppTest):
     """
 
     def __init__(self, *args, **kwargs):
-        if 'BOK_CHOY_HOSTNAME' not in os.environ:
-            # Hack until we upgrade Firefox and install geckodriver in Vagrant and Jenkins
-            DesiredCapabilities.FIREFOX['marionette'] = False
         super(AcceptanceTest, self).__init__(*args, **kwargs)
 
         # Use long messages so that failures show actual and expected values

common/test/acceptance/tests/lms/test_learner_profile.py

@@ -44,8 +44,11 @@ class LearnerProfileTestMixin(EventsTestMixin):
         """
         Fill in the public profile fields of a user.
         """
-        profile_page.value_for_dropdown_field('language_proficiencies', 'English', focus_out=True)
-        profile_page.value_for_dropdown_field('country', 'United Arab Emirates', focus_out=True)
+        # These value_for_dropdown_field method calls used to include
+        # focus_out = True, but a change in selenium is focusing out of the
+        # drop down after selection without any more action needed.
+        profile_page.value_for_dropdown_field('language_proficiencies', 'English')
+        profile_page.value_for_dropdown_field('country', 'United Arab Emirates')
         profile_page.set_value_for_textarea_field('bio', 'Nothing Special')
         # Waits here for text to appear/save on bio field
         profile_page.wait_for_ajax()

common/test/acceptance/tests/lms/test_lms_gating.py

@@ -210,6 +210,7 @@ class GatingTest(UniqueCourseTest):
 
         self.course_home_page.visit()
         self.course_home_page.preview.set_staff_view_mode('Learner')
+        self.course_home_page.wait_for_page()
         self.assertEqual(self.course_home_page.outline.num_subsections, 2)
         self.course_home_page.outline.go_to_section('Test Section 1', 'Test Subsection 1')
         self.courseware_page.wait_for_page()
@@ -218,6 +219,7 @@ class GatingTest(UniqueCourseTest):
 
         self.course_home_page.visit()
         self.course_home_page.preview.set_staff_view_mode_specific_student(self.STUDENT_USERNAME)
+        self.course_home_page.wait_for_page()
         self.assertEqual(self.course_home_page.outline.num_subsections, 2)
         self.course_home_page.outline.go_to_section('Test Section 1', 'Test Subsection 2')
         self.courseware_page.wait_for_page()

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

@@ -784,6 +784,7 @@ class YouTubeVideoTest(VideoBaseTest):
 
         langs = {'zh_HANS': '在线学习是革', 'zh_HANT': '在線學習是革'}
         for lang_code, text in langs.items():
+            self.video.scroll_to_button("transcript_button")
             self.assertTrue(self.video.select_language(lang_code))
             unicode_text = text.decode('utf-8')
             self.assertIn(unicode_text, self.video.captions_text)

requirements/edx/base.txt

@@ -169,7 +169,7 @@ sqlparse>=0.2.0,<0.3.0
 
 # Used for testing
 before_after==0.1.3
-bok-choy==0.7.1
+git+https://github.com/edx/bok-choy@215b0bde2b0cd94dec3e9d2620aa8e44f4ee249d#egg=bok-choy==0.7.1
 
 chrono==1.0.2
 ddt==0.8.0
@@ -191,7 +191,7 @@ PyContracts==1.7.1
 python-subunit==0.0.16
 pyquery==1.2.9
 radon==1.3.2
-selenium==3.3.1
+selenium==3.11.0
 splinter==0.5.4
 testtools==0.9.34
 testfixtures==4.5.0