Merge pull request #1605 from akvo/#1595-fix-tests

[Fixes #1595] updated test after new languages
akvo · Jun 3, 2015 · 4019fa5 · 4019fa5
2 parents 538e7ae + 96aa381
commit 4019fa5
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/akvo/rsr/tests/pages/test_homepage.py b/akvo/rsr/tests/pages/test_homepage.py
@@ -22,5 +22,5 @@ def test_redirect(self):
         """Ping /."""
         response = self.c.get('/', follow=True)
         expected_host = settings.RSR_DOMAIN
-        self.assertRedirects(response=response, expected_url='/projects/', status_code=302,
+        self.assertRedirects(response=response, expected_url='/en/projects/', status_code=302,
                              target_status_code=200, host=expected_host)
diff --git a/akvo/rsr/tests/pages/test_organisations_dir.py b/akvo/rsr/tests/pages/test_organisations_dir.py
@@ -19,10 +19,17 @@ def setUp(self):
         """Setup."""
         self.c = Client(HTTP_HOST=settings.RSR_DOMAIN)
         self.resp = self.c.get('/organisations/')
+        self.en_resp = self.c.get('/en/organisations/')
+        self.es_resp = self.c.get('/es/organisations/')
 
     def test_ping(self):
         """Ping /organisations/."""
-        self.assertEqual(self.resp.status_code, 200)
+        self.assertEqual(self.en_resp.status_code, 200)
+        self.assertEqual(self.es_resp.status_code, 200)
+
+    def test_redirect(self):
+        """Test /organisations/ redirect."""
+        self.assertEqual(self.resp.status_code, 302)
 
     def test_template_markup(self):
         """Check for common template errors."""

diff --git a/akvo/rsr/tests/pages/test_project_dir.py b/akvo/rsr/tests/pages/test_project_dir.py
@@ -19,10 +19,17 @@ def setUp(self):
         """Setup."""
         self.c = Client(HTTP_HOST=settings.RSR_DOMAIN)
         self.resp = self.c.get('/projects/')
+        self.en_resp = self.c.get('/en/projects/')
+        self.es_resp = self.c.get('/es/projects/')
 
     def test_ping(self):
         """Ping /projects/."""
-        self.assertEqual(self.resp.status_code, 200)
+        self.assertEqual(self.en_resp.status_code, 200)
+        self.assertEqual(self.es_resp.status_code, 200)
+
+    def test_redirect(self):
+        """Test /projects/ redirect"""
+        self.assertEqual(self.resp.status_code, 302)
 
     def test_template_markup(self):
         """Check for common template errors."""

diff --git a/akvo/rsr/tests/pages/test_updates_dir.py b/akvo/rsr/tests/pages/test_updates_dir.py
@@ -19,10 +19,17 @@ def setUp(self):
         """Setup."""
         self.c = Client(HTTP_HOST=settings.RSR_DOMAIN)
         self.resp = self.c.get('/updates/')
+        self.en_resp = self.c.get('/en/updates/')
+        self.es_resp = self.c.get('/es/updates/')
 
     def test_ping(self):
         """Ping /updates/."""
-        self.assertEqual(self.resp.status_code, 200)
+        self.assertEqual(self.en_resp.status_code, 200)
+        self.assertEqual(self.es_resp.status_code, 200)
+
+    def test_ping(self):
+        """Test /updates/ redirect."""
+        self.assertEqual(self.resp.status_code, 302)
 
     def test_template_markup(self):
         """Check for common template errors."""

diff --git a/akvo/rsr/tests/test_middleware.py b/akvo/rsr/tests/test_middleware.py
@@ -135,9 +135,10 @@ def test_partner_site(self):
 
     def test_valid_partner_site(self):
         """."""
-        valid_resp = self.c.get('/')
+        valid_resp = self.c.get('/', follow=True)
         expected_host = "partner1.{}".format(settings.AKVOAPP_DOMAIN)
-        self.assertRedirects(response=valid_resp, expected_url="/projects/",
+        # print valid_resp.redirect_chain
+        self.assertRedirects(response=valid_resp, expected_url="/en/projects/",
                              status_code=302, target_status_code=200, host=expected_host)
 
 
@@ -161,9 +162,9 @@ def test_partner_site(self):
 
     def test_valid_partner_site(self):
         """."""
-        valid_resp = self.c.get('/')
+        valid_resp = self.c.get('/', follow=True)
         # expected_host = "partner1.{}".format(settings.AKVOAPP_DOMAIN)
-        self.assertRedirects(response=valid_resp, expected_url="/projects/",
+        self.assertRedirects(response=valid_resp, expected_url="/en/projects/",
                              status_code=302, target_status_code=200, host=self.cname)