Fix tests.

playpauseandstop · playpauseandstop · commit 8d3ed1d37fe6 · 2012-10-01T11:11:01.000+03:00
diff --git a/learnpython/tests/common.py b/learnpython/tests/common.py
@@ -24,14 +24,15 @@ class TestCase(BaseTestCase):
     Improve base test class from ``Flask-Testing`` with adding ``url`` method
     and ``udata`` property to each test client response.
     """
+    BABEL_DEFAULT_LOCALE = 'en'
     CSRF_ENABLED = False
     TESTING = True
 
     def setUp(self):
         self.about_url = self.url('page', name='about')
         self.contacts_url = self.url('contacts')
         self.flows_url = self.url('flows')
-        self.index_url = self.url('page', name='index')
+        self.index_url = self.url('index')
         self.status_url = self.url('status')
         self.subscribe_url = self.url('subscribe')
 
diff --git a/learnpython/tests/test_flask.py b/learnpython/tests/test_flask.py
@@ -18,13 +18,7 @@ def tearDown(self):
         self._ctx.pop()
 
     def test_index(self):
-        index_url = url_for('page', name='index')
-        index_url_ext = url_for('page', name='index', _external=True)
-
-        response = self.client.get('/')
-        self.assertEqual(response.status_code, 301)
-        self.assertEqual(response.headers['Location'], index_url_ext)
-
+        index_url = url_for('index')
         response = self.client.get(index_url)
         self.assertEqual(response.status_code, 200)
         self.assertIn('Learn Python', response.data)
diff --git a/learnpython/tests/test_flasktesting.py b/learnpython/tests/test_flasktesting.py
@@ -82,10 +82,6 @@ def test_flows(self):
             self.assertIn('id="{0}"'.format(name), response.data)
 
     def test_index(self):
-        response = self.client.get('/')
-        self.assertRedirects(response, self.index_url)
-        self.assertStatus(response, 301)
-
         self.check_page('index', self.index_url)
 
         urls = (self.contacts_url, self.flows_url + '#medium',
diff --git a/learnpython/tests/test_selenium.py b/learnpython/tests/test_selenium.py
@@ -51,9 +51,9 @@ def url(self, url_rule, *args, **kwargs):
         return self.host + url
 
     def test_index(self):
-        index_url = self.url('page', name='index')
+        index_url = self.url('index')
 
-        self.browser.get(self.url('/'))
+        self.browser.get(index_url)
         self.assertEqual(self.browser.current_url, index_url)
         time.sleep(1)
 
diff --git a/learnpython/tests/test_splinter.py b/learnpython/tests/test_splinter.py
@@ -44,11 +44,10 @@ def url(self, url_rule, *args, **kwargs):
         return self.host + url
 
     def test_index(self):
-        index_url = self.url('page', name='index')
+        index_url = self.url('index')
 
-        self.browser.visit(self.url('/'))
+        self.browser.visit(index_url)
         self.assertEqual(self.browser.url, index_url)
-        self.assertEqual(self.browser.title, 'Learn Python in Kyiv, Ukraine')
 
         link = self.browser.find_link_by_text('Learn Python')
         self.assertEqual(len(link), 1)
diff --git a/learnpython/tests/test_webtest.py b/learnpython/tests/test_webtest.py
@@ -112,9 +112,6 @@ def test_flows(self):
             method('active', element.attrib['class'])
 
     def test_index(self):
-        response = self.webtest.get('/', status=301)
-        self.assertRedirects(response, self.index_url)
-
         self.check_page('index', self.index_url)
 
         response = self.webtest.get(self.index_url)
@@ -135,7 +132,7 @@ def test_index(self):
             (self.about_url, 'About us'),
             (self.contacts_url, 'Contacts')
         )
-        self.check_links(doc('header a'), result)
+        self.check_links(doc('header .left-wrapper p a'), result)
 
         result = (
             (self.flows_url + '#medium', 'Medium flow'),
