From: Diane Trout <diane@ghic.org>
Date: Thu, 2 Jun 2016 00:04:40 +0000 (-0700)
Subject: Admin url includes /change/ at the end
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=08701304a9fd0cf672eb421e2aa955c3f214c752

Admin url includes /change/ at the end

so my tests that were looking at
/admin/experiments/flowcel/{flowcell id}/
needed to change to
/admin/experiments/flowcel/{flowcell id}/change/

this of course means we now require django 1.9 for tests.
---

diff --git a/experiments/test_experiments.py b/experiments/test_experiments.py
index 679c705..597da2a 100644
--- a/experiments/test_experiments.py
+++ b/experiments/test_experiments.py
@@ -194,7 +194,10 @@ class ExperimentsTestCases(TestCase):
         """
         expected_ids = [ '1215{}'.format(i) for i in range(1,9) ]
         self.assertTrue(self.client.login(username=self.admin.username, password=self.password))
-        response = self.client.get('/admin/experiments/flowcell/{}/'.format(self.fc12150.id))
+        response = self.client.get(
+            '/admin/experiments/flowcell/{}/change/'.format(self.fc12150.id),
+            follow=True)
+        self.assertEquals(response.status_code, 200)
 
         tree = fromstring(response.content)
         for i in range(0,8):
@@ -493,15 +496,14 @@ class TestEmailNotify(TestCase):
         """
         Can we navigate between the flowcell and email forms properly?
         """
-        admin_url = '/admin/experiments/flowcell/{}/'.format(self.fc.id)
+        admin_url = '/admin/experiments/flowcell/{}/change/'.format(self.fc.id)
         self.client.login(username=self.admin.username, password=self.password)
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
-        #print("email navigation content:", response.content)
         self.assertTrue(re.search(self.fc.flowcell_id, smart_text(response.content)))
         # require that navigation back to the admin page exists
-        self.assertTrue(re.search('<a href="{}">[^<]+</a>'.format(admin_url),
-                                  smart_text(response.content)))
+        admin_a_tag = '<a href="{}">[^<]+</a>'.format(admin_url)
+        self.assertTrue(re.search(admin_a_tag, smart_text(response.content)))
 
 def multi_lane_to_dict(lane):
     """Convert a list of lane entries into a dictionary indexed by library ID