From 222fdec58f3b450ea159eaec105329f65cb32128 Mon Sep 17 00:00:00 2001 From: raeeschachar Date: Fri, 21 Aug 2015 13:13:28 +0500 Subject: [PATCH] Fixed test_new_textbook_uplaod test that was failing on Chrome --- common/test/acceptance/pages/studio/textbooks.py | 16 ++++------------ .../tests/studio/test_studio_textbooks.py | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/common/test/acceptance/pages/studio/textbooks.py b/common/test/acceptance/pages/studio/textbooks.py index 5f8a06bb19..83ae4bfd35 100644 --- a/common/test/acceptance/pages/studio/textbooks.py +++ b/common/test/acceptance/pages/studio/textbooks.py @@ -49,23 +49,15 @@ class TextbooksPage(CoursePage): file_input = self.q(css=".upload-dialog input").results[0] file_input.send_keys(file_path) click_css(self, ".wrapper-modal-window-assetupload .action-upload", require_notification=False) - self.wait_for_element_absence(".upload dialog", "Upload modal closed") + self.wait_for_element_absence(".modal-window-overlay", "Upload modal closed") def click_textbook_submit_button(self): """ Submit the new textbook form and check if it is rendered properly. """ - def click_save(): - """ - Continue to click the save button until the form is no longer present. Without this, - the test sporadically fails because the click is too early. - """ - save_button = self.q(css='#edit_textbook_form button[type="submit"]').results - if len(save_button) > 0: - save_button[0].click() - return not self.q(css="#edit_textbook_form").present - - self.wait_for(click_save, "Editing form should close.") + self.wait_for_element_visibility('#edit_textbook_form button[type="submit"]', 'Save button visibility') + self.q(css='#edit_textbook_form button[type="submit"]').first.click() + self.wait_for_element_absence(".wrapper-form", "Add/Edit form closed") def is_view_live_link_worked(self): """ diff --git a/common/test/acceptance/tests/studio/test_studio_textbooks.py b/common/test/acceptance/tests/studio/test_studio_textbooks.py index 53ce2a6e3a..3f2527c0bc 100644 --- a/common/test/acceptance/tests/studio/test_studio_textbooks.py +++ b/common/test/acceptance/tests/studio/test_studio_textbooks.py @@ -46,6 +46,6 @@ class TextbooksTest(StudioCourseTest): self.textbook_page.open_add_textbook_form() self.textbook_page.upload_pdf_file('textbook.pdf') self.textbook_page.set_input_field_value('.edit-textbook #textbook-name-input', 'book_1') - self.textbook_page.set_input_field_value('.edit-textbook #chapter1-name', 'chapter_1') + self.textbook_page.set_input_field_value('.edit-textbook #chapter1-name', 'chap_1') self.textbook_page.click_textbook_submit_button() self.assertTrue(self.textbook_page.is_view_live_link_worked())