From e494d529fc48f21c1bb01bdee7dc8515035b6219 Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Fri, 22 Mar 2013 11:38:30 -0400
Subject: [PATCH] Split terrain/helpers.py into ui_helpers.py and
 course_helpers.py

---
 .../terrain/{helpers.py => course_helpers.py} | 32 -------------------
 common/djangoapps/terrain/steps.py            |  3 +-
 common/djangoapps/terrain/ui_helpers.py       | 30 +++++++++++++++++
 3 files changed, 32 insertions(+), 33 deletions(-)
 rename common/djangoapps/terrain/{helpers.py => course_helpers.py} (82%)
 create mode 100644 common/djangoapps/terrain/ui_helpers.py

diff --git a/common/djangoapps/terrain/helpers.py b/common/djangoapps/terrain/course_helpers.py
similarity index 82%
rename from common/djangoapps/terrain/helpers.py
rename to common/djangoapps/terrain/course_helpers.py
index 12d6818659..dbdaa2a21c 100644
--- a/common/djangoapps/terrain/helpers.py
+++ b/common/djangoapps/terrain/course_helpers.py
@@ -12,17 +12,6 @@ import os.path
 from selenium.common.exceptions import WebDriverException
 from urllib import quote_plus
 from lettuce.django import django_url
-import time
-
-@world.absorb
-def wait(seconds):
-    time.sleep(float(seconds))
-
-@world.absorb
-def scroll_to_bottom():
-    # Maximize the browser
-    world.browser.execute_script("window.scrollTo(0, screen.height);")
-
 
 @world.absorb
 def create_user(uname):
@@ -87,15 +76,6 @@ def register_by_course_id(course_id, is_staff=False):
     CourseEnrollment.objects.get_or_create(user=u, course_id=course_id)
 
 
-@world.absorb
-def save_the_html(path='/tmp'):
-    u = world.browser.url
-    html = world.browser.html.encode('ascii', 'ignore')
-    filename = '%s.html' % quote_plus(u)
-    f = open('%s/%s' % (path, filename), 'w')
-    f.write(html)
-    f.close
-
 
 @world.absorb
 def save_the_course_content(path='/tmp'):
@@ -139,15 +119,3 @@ def save_the_course_content(path='/tmp'):
     f = open('%s/%s' % (path, filename), 'w')
     f.write(output)
     f.close
-
-@world.absorb
-def css_click(css_selector):
-    try:
-        world.browser.find_by_css(css_selector).click()
-
-    except WebDriverException:
-        # Occassionally, MathJax or other JavaScript can cover up
-        # an element  temporarily.
-        # If this happens, wait a second, then try again
-        time.sleep(1)
-        world.browser.find_by_css(css_selector).click()
diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py
index ae36227fee..6e54b71aa6 100644
--- a/common/djangoapps/terrain/steps.py
+++ b/common/djangoapps/terrain/steps.py
@@ -1,5 +1,6 @@
 from lettuce import world, step
-from .helpers import *
+from .course_helpers import *
+from .ui_helpers import *
 from lettuce.django import django_url
 from nose.tools import assert_equals
 import time
diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py
new file mode 100644
index 0000000000..4667957e87
--- /dev/null
+++ b/common/djangoapps/terrain/ui_helpers.py
@@ -0,0 +1,30 @@
+from lettuce import world, step
+import time
+from urllib import quote_plus
+
+@world.absorb
+def wait(seconds):
+    time.sleep(float(seconds))
+
+
+@world.absorb
+def css_click(css_selector):
+    try:
+        world.browser.find_by_css(css_selector).click()
+
+    except WebDriverException:
+        # Occassionally, MathJax or other JavaScript can cover up
+        # an element  temporarily.
+        # If this happens, wait a second, then try again
+        time.sleep(1)
+        world.browser.find_by_css(css_selector).click()
+
+@world.absorb
+def save_the_html(path='/tmp'):
+    u = world.browser.url
+    html = world.browser.html.encode('ascii', 'ignore')
+    filename = '%s.html' % quote_plus(u)
+    f = open('%s/%s' % (path, filename), 'w')
+    f.write(html)
+    f.close
+