diff --git a/ckan/new_tests/controllers/test_package.py b/ckan/new_tests/controllers/test_package.py index cb9051ff532..56ce957897c 100644 --- a/ckan/new_tests/controllers/test_package.py +++ b/ckan/new_tests/controllers/test_package.py @@ -18,7 +18,7 @@ def test_form_renders(self): ) assert_true('dataset-edit' in response.forms) - def test_next_button_works(self): + def test_name_required(self): user = factories.Sysadmin() env = {'REMOTE_USER': user['name'].encode('ascii')} response = self.app.get( @@ -26,11 +26,10 @@ def test_next_button_works(self): extra_environ=env, ) form = response.forms['dataset-edit'] - form['name'] = u'next-button-works' - form['title'] = u'Next button works' - response = webtest_submit(form, 'save', status=302, extra_environ=env) - assert_true('Location' in dict(response.headers)) + response = webtest_submit(form, 'save', status=200, extra_environ=env) + assert_true('dataset-edit' in response.forms) + assert_true('Name: Missing value' in response) def test_resource_form_renders(self): user = factories.Sysadmin() @@ -41,7 +40,6 @@ def test_resource_form_renders(self): ) form = response.forms['dataset-edit'] form['name'] = u'resource-form-renders' - form['title'] = u'Resource form renders' response = self._submit_and_follow(form, env, 'save') assert_true('resource-edit' in response.forms) @@ -55,7 +53,6 @@ def test_previous_button_works(self): ) form = response.forms['dataset-edit'] form['name'] = u'previous-button-works' - form['title'] = u'Previous button works' response = self._submit_and_follow(form, env, 'save') form = response.forms['resource-edit'] @@ -72,7 +69,6 @@ def test_previous_button_populates_form(self): ) form = response.forms['dataset-edit'] form['name'] = u'previous-button-populates-form' - form['title'] = u'Previous button populates form' response = self._submit_and_follow(form, env, 'save') form = response.forms['resource-edit'] @@ -80,5 +76,6 @@ def test_previous_button_populates_form(self): response = self._submit_and_follow(form, env, 'save', 'go-dataset') form = response.forms['dataset-edit'] assert_true('title' in form.fields) - assert_equal(form['title'].value, u'Previous button populates form') + # name gets copied to title by default validators + assert_equal(form['title'].value, u'previous-button-populates-form') assert_equal(form['name'].value, u'previous-button-populates-form') diff --git a/ckan/new_tests/helpers.py b/ckan/new_tests/helpers.py index ef015c5f087..9003a6fcb74 100644 --- a/ckan/new_tests/helpers.py +++ b/ckan/new_tests/helpers.py @@ -178,15 +178,13 @@ def teardown_class(cls): config.update(cls._original_config) def _submit_and_follow(self, form, extra_environ, name=None, - value=None, **args): + value=None, **args): ''' Call webtest_submit with name/value passed expecting a redirect and return the response from following that redirect. ''' - response = webtest_submit(form, name, value=value, + response = webtest_submit(form, name, value=value, status=302, extra_environ=extra_environ, **args) - if response.status_int != 302: - raise ValueError('response was not a redirect') return self.app.get(url=response.headers['Location'], extra_environ=extra_environ)