From fc03233a9ded6ebae61a4fd03b92d945d52c9e48 Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Fri, 13 Jun 2014 13:49:14 -0400
Subject: [PATCH] [#1659] factor out common startup code

---
 ckan/new_tests/controllers/test_package.py | 48 +++++-----------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/ckan/new_tests/controllers/test_package.py b/ckan/new_tests/controllers/test_package.py
index 671d6732c92..0688d611941 100644
--- a/ckan/new_tests/controllers/test_package.py
+++ b/ckan/new_tests/controllers/test_package.py
@@ -10,22 +10,21 @@
 
 
 class TestPackageControllerNew(helpers.FunctionalTestBase):
-    def test_form_renders(self):
+    def _get_package_new_page_as_sysadmin(self):
         user = factories.Sysadmin()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
         response = self.app.get(
             url=url_for(controller='package', action='new'),
             extra_environ=env,
         )
+        return env, response
+
+    def test_form_renders(self):
+        env, response = self._get_package_new_page_as_sysadmin()
         assert_true('dataset-edit' in response.forms)
 
     def test_name_required(self):
-        user = factories.Sysadmin()
-        env = {'REMOTE_USER': user['name'].encode('ascii')}
-        response = self.app.get(
-            url=url_for(controller='package', action='new'),
-            extra_environ=env,
-        )
+        env, response = self._get_package_new_page_as_sysadmin()
         form = response.forms['dataset-edit']
 
         response = webtest_submit(form, 'save', status=200, extra_environ=env)
@@ -33,12 +32,7 @@ def test_name_required(self):
         assert_true('Name: Missing value' in response)
 
     def test_resource_form_renders(self):
-        user = factories.Sysadmin()
-        env = {'REMOTE_USER': user['name'].encode('ascii')}
-        response = self.app.get(
-            url=url_for(controller='package', action='new'),
-            extra_environ=env,
-        )
+        env, response = self._get_package_new_page_as_sysadmin()
         form = response.forms['dataset-edit']
         form['name'] = u'resource-form-renders'
 
@@ -46,12 +40,7 @@ def test_resource_form_renders(self):
         assert_true('resource-edit' in response.forms)
 
     def test_first_page_creates_draft_package(self):
-        user = factories.Sysadmin()
-        env = {'REMOTE_USER': user['name'].encode('ascii')}
-        response = self.app.get(
-            url=url_for(controller='package', action='new'),
-            extra_environ=env,
-        )
+        env, response = self._get_package_new_page_as_sysadmin()
         form = response.forms['dataset-edit']
         form['name'] = u'first-page-creates-draft'
 
@@ -60,12 +49,7 @@ def test_first_page_creates_draft_package(self):
         assert_equal(pkg.state, 'draft')
 
     def test_previous_button_works(self):
-        user = factories.Sysadmin()
-        env = {'REMOTE_USER': user['name'].encode('ascii')}
-        response = self.app.get(
-            url=url_for(controller='package', action='new'),
-            extra_environ=env,
-        )
+        env, response = self._get_package_new_page_as_sysadmin()
         form = response.forms['dataset-edit']
         form['name'] = u'previous-button-works'
 
@@ -76,12 +60,7 @@ def test_previous_button_works(self):
         assert_true('dataset-edit' in response.forms)
 
     def test_previous_button_populates_form(self):
-        user = factories.Sysadmin()
-        env = {'REMOTE_USER': user['name'].encode('ascii')}
-        response = self.app.get(
-            url=url_for(controller='package', action='new'),
-            extra_environ=env,
-        )
+        env, response = self._get_package_new_page_as_sysadmin()
         form = response.forms['dataset-edit']
         form['name'] = u'previous-button-populates-form'
 
@@ -94,12 +73,7 @@ def test_previous_button_populates_form(self):
         assert_equal(form['name'].value, u'previous-button-populates-form')
 
     def test_previous_next_maintains_draft_state(self):
-        user = factories.Sysadmin()
-        env = {'REMOTE_USER': user['name'].encode('ascii')}
-        response = self.app.get(
-            url=url_for(controller='package', action='new'),
-            extra_environ=env,
-        )
+        env, response = self._get_package_new_page_as_sysadmin()
         form = response.forms['dataset-edit']
         form['name'] = u'previous-next-maintains-draft'