Skip to content

Commit

Permalink
[#2042] Move related tests to new_tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
David Read committed Nov 21, 2014
1 parent 39132e3 commit 737c4bd
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 24 deletions.
31 changes: 31 additions & 0 deletions ckan/new_tests/controllers/test_feed.py
@@ -0,0 +1,31 @@
from routes import url_for

from ckan import model
import ckan.new_tests.helpers as helpers
import ckan.new_tests.factories as factories


class TestFeedNew(helpers.FunctionalTestBase):

@classmethod
def setup_class(cls):
helpers.reset_db()

def setup(self):
model.repo.rebuild_db()

def test_atom_feed_page_zero_gives_error(self):
group = factories.Group()
offset = url_for(controller='feed', action='group',
id=group['name']) + '?page=0'
app = self._get_test_app()
res = app.get(offset, status=400)
assert '"page" parameter must be a positive integer' in res, res

def test_atom_feed_page_negative_gives_error(self):
group = factories.Group()
offset = url_for(controller='feed', action='group',
id=group['name']) + '?page=-2'
app = self._get_test_app()
res = app.get(offset, status=400)
assert '"page" parameter must be a positive integer' in res, res
24 changes: 0 additions & 24 deletions ckan/tests/functional/test_group.py
Expand Up @@ -31,30 +31,6 @@ def setup_class(self):
def teardown_class(self):
model.repo.rebuild_db()

def test_atom_feed_page_zero(self):
group_name = 'deletetest'
CreateTestData.create_groups([{'name': group_name,
'packages': []}],
admin_user_name='testsysadmin')

offset = url_for(controller='feed', action='group',
id=group_name)
offset = offset + '?page=0'
res = self.app.get(offset, expect_errors=True)
assert '"page" parameter must be a positive integer' in res, res

def test_atom_feed_page_negative(self):
group_name = 'atom_feed_test'
CreateTestData.create_groups([{'name': group_name,
'packages': []}],
admin_user_name='testsysadmin')

offset = url_for(controller='feed', action='group',
id=group_name)
offset = offset + '?page=-2'
res = self.app.get(offset, expect_errors=True)
assert '"page" parameter must be a positive integer' in res, res

def test_sorting(self):
model.repo.rebuild_db()

Expand Down

0 comments on commit 737c4bd

Please sign in to comment.