From 94d0ad55638659edbbb0c2e80367a36d9d53516b Mon Sep 17 00:00:00 2001 From: JonahStanley Date: Tue, 30 Jul 2013 13:42:31 -0400 Subject: [PATCH] Fixed issue preventing navigation to various course setting pages --- .../contentstore/features/course-updates.py | 2 +- cms/djangoapps/contentstore/features/static-pages.py | 12 +++++++----- cms/djangoapps/contentstore/features/textbooks.py | 4 ++-- cms/djangoapps/contentstore/features/video.py | 3 ++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cms/djangoapps/contentstore/features/course-updates.py b/cms/djangoapps/contentstore/features/course-updates.py index 9506191a76..f431af9cf5 100644 --- a/cms/djangoapps/contentstore/features/course-updates.py +++ b/cms/djangoapps/contentstore/features/course-updates.py @@ -9,7 +9,7 @@ from common import type_in_codemirror @step(u'I go to the course updates page') def go_to_updates(_step): menu_css = 'li.nav-course-courseware' - updates_css = 'li.nav-course-courseware-updates' + updates_css = 'li.nav-course-courseware-updates a' world.css_click(menu_css) world.css_click(updates_css) diff --git a/cms/djangoapps/contentstore/features/static-pages.py b/cms/djangoapps/contentstore/features/static-pages.py index 3c9226f874..20473721a4 100644 --- a/cms/djangoapps/contentstore/features/static-pages.py +++ b/cms/djangoapps/contentstore/features/static-pages.py @@ -8,7 +8,7 @@ from selenium.webdriver.common.keys import Keys @step(u'I go to the static pages page') def go_to_static(_step): menu_css = 'li.nav-course-courseware' - static_css = 'li.nav-course-courseware-pages' + static_css = 'li.nav-course-courseware-pages a' world.css_click(menu_css) world.css_click(static_css) @@ -38,13 +38,15 @@ def click_edit_delete(_step, edit_delete, page): @step(u'I change the name to "([^"]*)"$') def change_name(_step, new_name): - settings_css = '#settings-mode' + settings_css = '#settings-mode a' world.css_click(settings_css) input_css = 'input.setting-input' name_input = world.css_find(input_css) - old_name = name_input.value - for count in range(len(old_name)): - name_input._element.send_keys(Keys.END, Keys.BACK_SPACE) + if world.is_mac(): + name_input._element.send_keys(Keys.COMMAND + 'a') + else: + name_input._element.send_keys(Keys.CONTROL + 'a') + name_input._element.send_keys(Keys.DELETE) name_input._element.send_keys(new_name) save_button = 'a.save-button' world.css_click(save_button) diff --git a/cms/djangoapps/contentstore/features/textbooks.py b/cms/djangoapps/contentstore/features/textbooks.py index ca135d9725..31e628a0b2 100644 --- a/cms/djangoapps/contentstore/features/textbooks.py +++ b/cms/djangoapps/contentstore/features/textbooks.py @@ -11,8 +11,8 @@ TEST_ROOT = settings.COMMON_TEST_DATA_ROOT @step(u'I go to the textbooks page') def go_to_uploads(_step): world.click_course_content() - menu_css = 'li.nav-course-courseware-textbooks' - world.css_find(menu_css).click() + menu_css = 'li.nav-course-courseware-textbooks a' + world.css_click(menu_css) @step(u'I should see a message telling me to create a new textbook') diff --git a/cms/djangoapps/contentstore/features/video.py b/cms/djangoapps/contentstore/features/video.py index 0f8b87171c..e0d570accd 100644 --- a/cms/djangoapps/contentstore/features/video.py +++ b/cms/djangoapps/contentstore/features/video.py @@ -33,7 +33,8 @@ def hide_or_show_captions(step, shown): # click the button rather than the tooltip, so move the mouse # away to make it disappear. button = world.css_find(button_css) - button.mouse_out() + if world.browser.driver_name != 'Firefox': + button.mouse_out() world.css_click(button_css) @step('I edit the component')