From: Diane Trout <diane@ghic.org>
Date: Wed, 1 Jun 2016 23:38:28 +0000 (-0700)
Subject: Use reverse with named url patterns
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=7f26ee4cfde41806ff7054e1ebe7243d26905645

Use reverse with named url patterns

instead of with the full package name
---

diff --git a/experiments/test_experiments.py b/experiments/test_experiments.py
index 229f147..679c705 100644
--- a/experiments/test_experiments.py
+++ b/experiments/test_experiments.py
@@ -258,8 +258,7 @@ class ExperimentsTestCases(TestCase):
         self.assertEqual(len(lanes), 8)
 
         response = self.client.get(
-            reverse('experiments.views.lanes_for',
-                    args=[user]))
+            reverse('lanes_for', kwargs={'username': user}))
         self.assertEqual(response.status_code, 200)
         tree = fromstring(response.content)
         lane_trs = tree.xpath('//div[@id="changelist"]/table/tbody/tr')
@@ -274,8 +273,7 @@ class ExperimentsTestCases(TestCase):
         """Make sure we don't find anything with an invalid user
         """
         response = self.client.get(
-            reverse('experiments.views.lanes_for',
-                    args=["doesntexist"]))
+            reverse('lanes_for', kwargs={'username': 'doesntexist'}))
         self.assertEqual(response.status_code, 404)
 
     def test_lanes_for_json(self):
diff --git a/inventory/test_inventory.py b/inventory/test_inventory.py
index 34aa006..245a363 100644
--- a/inventory/test_inventory.py
+++ b/inventory/test_inventory.py
@@ -54,9 +54,9 @@ class InventoryTestCase(TestCase):
                                      libraries=[lib1,],
                                      storage_devices=[item,],)
 
-        url = reverse('inventory.views.itemtype_index',
+        url = reverse('itemtype_index',
                       kwargs={'name': item.item_type.name})
-        disk_url = reverse('inventory.views.item_summary_by_uuid',
+        disk_url = reverse('item_summary_by_uuid',
                            kwargs={'uuid': item.uuid})
         indexNode = localhostNode(url)
         diskNode = localhostNode(disk_url)
@@ -65,16 +65,16 @@ class InventoryTestCase(TestCase):
 
         flowcells = self.get_flowcells_from_content(url, indexNode, diskNode)
         self.failUnlessEqual(len(flowcells), 1)
-        flowcell_url = reverse('experiments.views.flowcell_detail',
+        flowcell_url = reverse('flowcell_detail',
                                kwargs={'flowcell_id': fc1.flowcell_id})
         self.assertTrue(flowcells[0].endswith(flowcell_url))
 
 
     def test_add_disk(self):
         item = ItemFactory()
-        url = reverse('inventory.views.itemtype_index',
+        url = reverse('itemtype_index',
                       kwargs={'name': item.item_type.name})
-        disk_url = reverse('inventory.views.item_summary_by_uuid',
+        disk_url = reverse('item_summary_by_uuid',
                            kwargs={'uuid': item.uuid})
         indexNode = localhostNode(url)
         diskNode = localhostNode(disk_url)
@@ -87,24 +87,22 @@ class InventoryTestCase(TestCase):
 
         # step two link the flowcell
         flowcell = FlowCellFactory(flowcell_id='22TWOAAXX')
-        link_url = reverse('inventory.views.link_flowcell_and_device',
+        link_url = reverse('link_flowcell_and_device',
                            args=(flowcell.flowcell_id,
                                  item.barcode_id))
         link_response = self.client.get(link_url)
         self.assertEqual(link_response.status_code, 200)
 
         flowcells = self.get_flowcells_from_content(url, indexNode, diskNode)
-        flowcell_url = reverse('experiments.views.flowcell_detail',
+        flowcell_url = reverse('flowcell_detail',
                                kwargs={'flowcell_id': flowcell.flowcell_id})
         self.assertEqual(len(flowcells), 1)
         self.assertTrue(flowcells[0].endswith(flowcell_url))
 
     def test_add_disk_failed_flowcell(self):
         item = ItemFactory()
-        url = reverse('inventory.views.itemtype_index',
-                      kwargs={'name': item.item_type.name})
-        disk_url = reverse('inventory.views.item_summary_by_uuid',
-                           kwargs={'uuid': item.uuid})
+        url = reverse('itemtype_index', kwargs={'name': item.item_type.name})
+        disk_url = reverse('item_summary_by_uuid', kwargs={'uuid': item.uuid})
         indexNode = localhostNode(url)
         diskNode = localhostNode(disk_url)
 
@@ -117,14 +115,14 @@ class InventoryTestCase(TestCase):
         # step two link the flowcell
         flowcell_id = '33THRAAXX'
         flowcell = FlowCellFactory(flowcell_id=flowcell_id +' (failed)')
-        link_url = reverse('inventory.views.link_flowcell_and_device',
+        link_url = reverse('link_flowcell_and_device',
                            args=(flowcell.flowcell_id, item.barcode_id))
         link_response = self.client.get(link_url)
         self.failUnlessEqual(link_response.status_code, 200)
 
         flowcells = self.get_flowcells_from_content(url, indexNode, diskNode)
         self.assertEqual(len(flowcells), 1)
-        flowcell_url = reverse('experiments.views.flowcell_detail',
+        flowcell_url = reverse('flowcell_detail',
                                kwargs={'flowcell_id': flowcell_id})
         self.assertTrue(flowcells[0].endswith(flowcell_url))