Refactored courseware_common and open_ended to use ui helpers

common/djangoapps/terrain/ui_helpers.py

@@ -21,6 +21,22 @@ def css_click(css_selector):
         world.browser.find_by_css(css_selector).click()
 
 @world.absorb
+def css_fill(css_selector, text):
+    world.browser.find_by_css(css_selector).first.fill(text)
+
+@world.absorb
+def click_link(partial_text):
+    world.browser.find_link_by_partial_text(partial_text).first.click()
+
+@world.absorb
+def css_text(css_selector):
+    return world.browser.find_by_css(css_selector).first.text
+
+@world.absorb
+def css_visible(css_selector):
+    return world.browser.find_by_css(css_selector).visible
+
+@world.absorb
 def save_the_html(path='/tmp'):
     u = world.browser.url
     html = world.browser.html.encode('ascii', 'ignore')

lms/djangoapps/courseware/features/courseware_common.py

@@ -9,11 +9,10 @@ def i_click_on_view_courseware(step):
 
 
 @step('I click on the "([^"]*)" tab$')
-def i_click_on_the_tab(step, tab):
-    world.browser.find_link_by_partial_text(tab).first.click()
+def i_click_on_the_tab(step, tab_text):
+    world.click_link(tab_text)
     world.save_the_html()
 
-
 @step('I visit the courseware URL$')
 def i_visit_the_course_info_url(step):
     url = django_url('/courses/MITx/6.002x/2012_Fall/courseware')
@@ -32,13 +31,9 @@ def i_am_on_the_dashboard_page(step):
 
 
 @step('the "([^"]*)" tab is active$')
-def the_tab_is_active(step, tab):
-    css = '.course-tabs a.active'
-    active_tab = world.browser.find_by_css(css)
-    assert (active_tab.text == tab)
-
+def the_tab_is_active(step, tab_text):
+    assert world.css_text('.course-tabs a.active') == tab_text
 
 @step('the login dialog is visible$')
 def login_dialog_visible(step):
-    css = 'form#login_form.login_form'
-    assert world.browser.find_by_css(css).visible
+    assert world.css_visible('form#login_form.login_form')

lms/djangoapps/courseware/features/openended.py

@@ -12,7 +12,7 @@ def navigate_to_an_openended_question(step):
     problem = '/courses/MITx/3.091x/2012_Fall/courseware/Week_10/Polymer_Synthesis/'
     world.browser.visit(django_url(problem))
     tab_css = 'ol#sequence-list > li > a[data-element="5"]'
-    world.browser.find_by_css(tab_css).click()
+    world.css_click(tab_css)
 
 
 @step('I navigate to an openended question as staff$')
@@ -22,50 +22,41 @@ def navigate_to_an_openended_question_as_staff(step):
     problem = '/courses/MITx/3.091x/2012_Fall/courseware/Week_10/Polymer_Synthesis/'
     world.browser.visit(django_url(problem))
     tab_css = 'ol#sequence-list > li > a[data-element="5"]'
-    world.browser.find_by_css(tab_css).click()
+    world.css_click(tab_css)
 
 
 @step(u'I enter the answer "([^"]*)"$')
 def enter_the_answer_text(step, text):
-    textarea_css = 'textarea'
-    world.browser.find_by_css(textarea_css).first.fill(text)
+    world.css_fill('textarea', text)
 
 
 @step(u'I submit the answer "([^"]*)"$')
 def i_submit_the_answer_text(step, text):
-    textarea_css = 'textarea'
-    world.browser.find_by_css(textarea_css).first.fill(text)
-    check_css = 'input.check'
-    world.browser.find_by_css(check_css).click()
+    world.css_fill('textarea', text)
+    world.css_click('input.check')
 
 
 @step('I click the link for full output$')
 def click_full_output_link(step):
-    link_css = 'a.full'
-    world.browser.find_by_css(link_css).first.click()
+    world.css_click('a.full')
 
 
 @step(u'I visit the staff grading page$')
 def i_visit_the_staff_grading_page(step):
-    # course_u = '/courses/MITx/3.091x/2012_Fall'
-    # sg_url = '%s/staff_grading' % course_u
-    world.browser.click_link_by_text('Instructor')
-    world.browser.click_link_by_text('Staff grading')
-    # world.browser.visit(django_url(sg_url))
+    world.click_link('Instructor')
+    world.click_link('Staff grading')
 
 
 @step(u'I see the grader message "([^"]*)"$')
 def see_grader_message(step, msg):
     message_css = 'div.external-grader-message'
-    grader_msg = world.browser.find_by_css(message_css).text
-    assert_in(msg, grader_msg)
+    assert_in(msg, world.css_text(message_css))
 
 
 @step(u'I see the grader status "([^"]*)"$')
 def see_the_grader_status(step, status):
     status_css = 'div.grader-status'
-    grader_status = world.browser.find_by_css(status_css).text
-    assert_equals(status, grader_status)
+    assert_equals(status, world.css_text(status_css))
 
 
 @step('I see the red X$')
@@ -77,7 +68,7 @@ def see_the_red_x(step):
 @step(u'I see the grader score "([^"]*)"$')
 def see_the_grader_score(step, score):
     score_css = 'div.result-output > p'
-    score_text = world.browser.find_by_css(score_css).text
+    score_text = world.css_text(score_css)
     assert_equals(score_text, 'Score: %s' % score)
 
 
@@ -89,14 +80,13 @@ def see_full_output_link(step):
 
 @step('I see the spelling grading message "([^"]*)"$')
 def see_spelling_msg(step, msg):
-    spelling_css = 'div.spelling'
-    spelling_msg = world.browser.find_by_css(spelling_css).text
+    spelling_msg = world.css_text('div.spelling')
     assert_equals('Spelling: %s' % msg, spelling_msg)
 
 
 @step(u'my answer is queued for instructor grading$')
 def answer_is_queued_for_instructor_grading(step):
     list_css = 'ul.problem-list > li > a'
-    actual_msg = world.browser.find_by_css(list_css).text
+    actual_msg = world.css_text(list_css)
     expected_msg = "(0 graded, 1 pending)"
     assert_in(expected_msg, actual_msg)