From 19513e4134bcad3ec4bc698ecd8fbd555ebadf22 Mon Sep 17 00:00:00 2001
From: JonahStanley <Jonah_Stanley@brown.edu>
Date: Wed, 3 Jul 2013 10:34:56 -0400
Subject: [PATCH] Refactored all clicks to use the css_click method

---
 cms/djangoapps/contentstore/features/checklists.py   |  4 ++--
 cms/djangoapps/contentstore/features/static-pages.py | 12 ++++++------
 cms/djangoapps/contentstore/features/upload.py       | 10 +++++-----
 common/djangoapps/terrain/ui_helpers.py              |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/checklists.py b/cms/djangoapps/contentstore/features/checklists.py
index 9552d35036..fe20fb9b77 100644
--- a/cms/djangoapps/contentstore/features/checklists.py
+++ b/cms/djangoapps/contentstore/features/checklists.py
@@ -115,7 +115,7 @@ def clickActionLink(checklist, task, actionText):
 
     # text will be empty initially, wait for it to populate
     def verify_action_link_text(driver):
-        return action_link.text == actionText
+        return world.css_text('#course-checklist' + str(checklist) + ' a', index=task) == actionText
 
     world.wait_for(verify_action_link_text)
-    action_link.click()
+    world.css_click('#course-checklist' + str(checklist) + ' a', index=task)
diff --git a/cms/djangoapps/contentstore/features/static-pages.py b/cms/djangoapps/contentstore/features/static-pages.py
index 2331f9a138..3c9226f874 100644
--- a/cms/djangoapps/contentstore/features/static-pages.py
+++ b/cms/djangoapps/contentstore/features/static-pages.py
@@ -9,14 +9,14 @@ from selenium.webdriver.common.keys import Keys
 def go_to_static(_step):
     menu_css = 'li.nav-course-courseware'
     static_css = 'li.nav-course-courseware-pages'
-    world.css_find(menu_css).click()
-    world.css_find(static_css).click()
+    world.css_click(menu_css)
+    world.css_click(static_css)
 
 
 @step(u'I add a new page')
 def add_page(_step):
     button_css = 'a.new-button'
-    world.css_find(button_css).click()
+    world.css_click(button_css)
 
 
 @step(u'I should( not)? see a "([^"]*)" static page$')
@@ -33,13 +33,13 @@ def click_edit_delete(_step, edit_delete, page):
     button_css = 'a.%s-button' % edit_delete
     index = get_index(page)
     assert index != -1
-    world.css_find(button_css)[index].click()
+    world.css_click(button_css, index=index)
 
 
 @step(u'I change the name to "([^"]*)"$')
 def change_name(_step, new_name):
     settings_css = '#settings-mode'
-    world.css_find(settings_css).click()
+    world.css_click(settings_css)
     input_css = 'input.setting-input'
     name_input = world.css_find(input_css)
     old_name = name_input.value
@@ -47,7 +47,7 @@ def change_name(_step, new_name):
         name_input._element.send_keys(Keys.END, Keys.BACK_SPACE)
     name_input._element.send_keys(new_name)
     save_button = 'a.save-button'
-    world.css_find(save_button).click()
+    world.css_click(save_button)
 
 
 def get_index(name):
diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py
index fe6b58b119..2b70cb059a 100644
--- a/cms/djangoapps/contentstore/features/upload.py
+++ b/cms/djangoapps/contentstore/features/upload.py
@@ -16,23 +16,23 @@ HTTP_PREFIX = "http://localhost:8001"
 def go_to_uploads(_step):
     menu_css = 'li.nav-course-courseware'
     uploads_css = 'li.nav-course-courseware-uploads'
-    world.css_find(menu_css).click()
-    world.css_find(uploads_css).click()
+    world.css_click(menu_css)
+    world.css_click(uploads_css)
 
 
 @step(u'I upload the file "([^"]*)"$')
 def upload_file(_step, file_name):
     upload_css = 'a.upload-button'
-    world.css_find(upload_css).click()
+    world.css_click(upload_css)
 
     file_css = 'input.file-input'
-    upload = world.css_find(file_css)
+    upload = world.css_click(file_css)
     #uploading the file itself
     path = os.path.join(TEST_ROOT, 'uploads/', file_name)
     upload._element.send_keys(os.path.abspath(path))
 
     close_css = 'a.close-button'
-    world.css_find(close_css).click()
+    world.css_click(close_css)
 
 
 @step(u'I should( not)? see the file "([^"]*)" was uploaded$')
diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py
index 615e596c91..ccf5cc12e8 100644
--- a/common/djangoapps/terrain/ui_helpers.py
+++ b/common/djangoapps/terrain/ui_helpers.py
@@ -153,16 +153,16 @@ def click_link(partial_text):
 
 
 @world.absorb
-def css_text(css_selector):
+def css_text(css_selector, index=0):
 
     # Wait for the css selector to appear
     if world.is_css_present(css_selector):
         try:
-            return world.browser.find_by_css(css_selector).first.text
+            return world.browser.find_by_css(css_selector)[index].text
         except StaleElementReferenceException:
             # The DOM was still redrawing. Wait a second and try again.
             world.wait(1)
-            return world.browser.find_by_css(css_selector).first.text
+            return world.browser.find_by_css(css_selector)[index].text
     else:
         return ""