From 36c475d524140407b5fa50396ee8e67e4de0c1d6 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 25 Jun 2015 19:50:29 +0100 Subject: [PATCH] Fix tests for the new split browse/search views. Tests for URLs that pass both a page ID and a query string have been removed, because that never happens in reality (and isn't possible at all in the new URL scheme). --- .../wagtailadmin/tests/test_page_chooser.py | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_page_chooser.py b/wagtail/wagtailadmin/tests/test_page_chooser.py index 0a0bf154f..b57a4758c 100644 --- a/wagtail/wagtailadmin/tests/test_page_chooser.py +++ b/wagtail/wagtailadmin/tests/test_page_chooser.py @@ -21,24 +21,27 @@ class TestChooserBrowse(TestCase, WagtailTestUtils): def get(self, params={}): return self.client.get(reverse('wagtailadmin_choose_page'), params) + def search(self, params={}): + return self.client.get(reverse('wagtailadmin_choose_page_search'), params) + def test_simple(self): response = self.get() self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'wagtailadmin/chooser/browse.html') def test_search(self): - response = self.get({'q': "foobarbaz"}) + response = self.search({'q': "foobarbaz"}) self.assertEqual(response.status_code, 200) self.assertContains(response, "There is one match") self.assertContains(response, "foobarbaz") def test_search_no_results(self): - response = self.get({'q': "quux"}) + response = self.search({'q': "quux"}) self.assertEqual(response.status_code, 200) self.assertContains(response, "There are 0 matches") def test_get_invalid(self): - response = self.get({'page_type': 'foo.bar'}) + response = self.search({'page_type': 'foo.bar'}) self.assertEqual(response.status_code, 404) @@ -67,17 +70,6 @@ class TestChooserBrowseChild(TestCase, WagtailTestUtils): self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'wagtailadmin/chooser/browse.html') - def test_search(self): - response = self.get({'q': "foobarbaz"}) - self.assertEqual(response.status_code, 200) - self.assertContains(response, "There is one match") - self.assertContains(response, "foobarbaz") - - def test_search_no_results(self): - response = self.get({'q': "quux"}) - self.assertEqual(response.status_code, 200) - self.assertContains(response, "There are 0 matches") - def test_get_invalid(self): self.assertEqual(self.get_invalid().status_code, 404)