Merge pull request #2062 from edx/diana/drupal/lettuce-tests

Fix Lettuce Tests for Drupal site

common/djangoapps/mitxmako/tests.py

@@ -0,0 +1,26 @@
+from django.test import TestCase
+from django.test.utils import override_settings
+from django.core.urlresolvers import reverse
+from django.conf import settings
+from mitxmako.shortcuts import marketing_link
+from mock import patch
+
+
+class ShortcutsTests(TestCase):
+    """
+    Test the mitxmako shortcuts file
+    """
+
+    @override_settings(MKTG_URLS={'ROOT': 'dummy-root', 'ABOUT': '/about-us'})
+    @override_settings(MKTG_URL_LINK_MAP={'ABOUT': 'about_edx'})
+    def test_marketing_link(self):
+        # test marketing site on
+        with patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': True}):
+            expected_link = 'dummy-root/about-us'
+            link = marketing_link('ABOUT')
+            self.assertEquals(link, expected_link)
+        # test marketing site off
+        with patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': False}):
+            expected_link = reverse('about_edx')
+            link = marketing_link('ABOUT')
+            self.assertEquals(link, expected_link)

common/djangoapps/terrain/steps.py

@@ -122,6 +122,13 @@ def should_see_a_link_called(step, text):
     assert len(world.browser.find_link_by_text(text)) > 0
 
 
+@step(r'should see (?:the|a) link with the id "([^"]*)" called "([^"]*)"$')
+def should_have_link_with_id_and_text(step, link_id, text):
+    link = world.browser.find_by_id(link_id)
+    assert len(link) > 0
+    assert_equals(link.text, text)
+
+
 @step(r'should see "(.*)" (?:somewhere|anywhere) in (?:the|this) page')
 def should_see_in_the_page(step, text):
     assert_in(text, world.css_text('body'))
@@ -144,3 +151,8 @@ def i_am_an_edx_user(step):
 @step(u'User "([^"]*)" is an edX user$')
 def registered_edx_user(step, uname):
     world.create_user(uname)
+
+
+@step(u'All dialogs should be closed$')
+def dialogs_are_closed(step):
+    assert world.dialogs_closed()

common/djangoapps/terrain/ui_helpers.py

@@ -1,7 +1,7 @@
 #pylint: disable=C0111
 #pylint: disable=W0621
 
-from lettuce import world, step
+from lettuce import world
 import time
 from urllib import quote_plus
 from selenium.common.exceptions import WebDriverException
@@ -104,6 +104,17 @@ def css_visible(css_selector):
     return world.browser.find_by_css(css_selector).visible
 
 
+@world.absorb
+def dialogs_closed():
+    def are_dialogs_closed(driver):
+        '''
+        Return True when no modal dialogs are visible
+        '''
+        return not css_visible('.modal')
+    wait_for(are_dialogs_closed)
+    return not css_visible('.modal')
+
+
 @world.absorb
 def save_the_html(path='/tmp'):
     u = world.browser.url
@@ -111,4 +122,4 @@ def save_the_html(path='/tmp'):
     filename = '%s.html' % quote_plus(u)
     f = open('%s/%s' % (path, filename), 'w')
     f.write(html)
-    f.close
+    f.close()