diff --git a/src/memopol/tests/base.py b/src/memopol/tests/base.py index f7029ca8f4e13f50c680bc6ab4212b6fcd1879e7..d360765d14337066c50ae7d41b783956e9f5b18e 100644 --- a/src/memopol/tests/base.py +++ b/src/memopol/tests/base.py @@ -9,14 +9,8 @@ class BaseTest(ResponseDiffTestMixin, test.TestCase): """ Common queries - 1 for settings - - 5 for search forms - - 1 for chambers - - 1 for countries - - 1 for parties - - 1 for committees - - 1 for delegations """ - left_pane_queries = 6 + left_pane_queries = 1 def setUp(self): RepresentativeScore.refresh() diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_dossier_search_chambers.content b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_dossier_search_chambers.content deleted file mode 100644 index 53a68d5bcb7fd4cb0e61e33bbda9f7a7eabeb4c1..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_dossier_search_chambers.content +++ /dev/null @@ -1,13 +0,0 @@ - ---- - ---- - ---- - \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_dossier_search_chambers.metadata b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_dossier_search_chambers.metadata deleted file mode 100644 index a2e0a6921bc4a7d94e1887a6eab7a49889fc3ace..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_dossier_search_chambers.metadata +++ /dev/null @@ -1,3 +0,0 @@ -{ - "status_code": 200 -} \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_chambers.content b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_chambers.content deleted file mode 100644 index 53a68d5bcb7fd4cb0e61e33bbda9f7a7eabeb4c1..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_chambers.content +++ /dev/null @@ -1,13 +0,0 @@ - ---- - ---- - ---- - \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_chambers.metadata b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_chambers.metadata deleted file mode 100644 index a2e0a6921bc4a7d94e1887a6eab7a49889fc3ace..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_chambers.metadata +++ /dev/null @@ -1,3 +0,0 @@ -{ - "status_code": 200 -} \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_committee.content b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_committee.content deleted file mode 100644 index d6c978ff78c1a3cf457f87e247e51e7f01d8e6e6..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_committee.content +++ /dev/null @@ -1,201 +0,0 @@ - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_committee.metadata b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_committee.metadata deleted file mode 100644 index a2e0a6921bc4a7d94e1887a6eab7a49889fc3ace..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_committee.metadata +++ /dev/null @@ -1,3 +0,0 @@ -{ - "status_code": 200 -} \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_countries.content b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_countries.content deleted file mode 100644 index d62645c7ded0742d1deb536d8a92e17ec36670a9..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_countries.content +++ /dev/null @@ -1,61 +0,0 @@ - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_countries.metadata b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_countries.metadata deleted file mode 100644 index a2e0a6921bc4a7d94e1887a6eab7a49889fc3ace..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_countries.metadata +++ /dev/null @@ -1,3 +0,0 @@ -{ - "status_code": 200 -} \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_delegation.content b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_delegation.content deleted file mode 100644 index d0de9dfb10efa1060e7a4357b4d57276cfe45a28..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_delegation.content +++ /dev/null @@ -1,969 +0,0 @@ - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_delegation.metadata b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_delegation.metadata deleted file mode 100644 index a2e0a6921bc4a7d94e1887a6eab7a49889fc3ace..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_delegation.metadata +++ /dev/null @@ -1,3 +0,0 @@ -{ - "status_code": 200 -} \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_parties.content b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_parties.content deleted file mode 100644 index 4c02a5fa34c9505c760409f449bd046cecaa5ab2..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_parties.content +++ /dev/null @@ -1,116 +0,0 @@ - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - ---- - \ No newline at end of file diff --git a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_parties.metadata b/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_parties.metadata deleted file mode 100644 index a2e0a6921bc4a7d94e1887a6eab7a49889fc3ace..0000000000000000000000000000000000000000 --- a/src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_parties.metadata +++ /dev/null @@ -1,3 +0,0 @@ -{ - "status_code": 200 -} \ No newline at end of file diff --git a/src/memopol/tests/test_home_navigation_pane.py b/src/memopol/tests/test_home.py similarity index 52% rename from src/memopol/tests/test_home_navigation_pane.py rename to src/memopol/tests/test_home.py index bba8efe9a0cc9def9c88b262aef6368bd1d50ab3..bf4fd5f9c384ab0d8bada411655d9da24563dc29 100644 --- a/src/memopol/tests/test_home_navigation_pane.py +++ b/src/memopol/tests/test_home.py @@ -1,7 +1,7 @@ from .base import BaseTest -class NavigationPaneTest(BaseTest): +class HomeTest(BaseTest): url = '/' def test_queries(self): @@ -22,30 +22,10 @@ class NavigationPaneTest(BaseTest): - 1 for prefetching latest votes dossier documents chambers - 1 for Featured themes - 1 for featured themes - - 0 for Chambers + - 1 for Chambers - 1 for chambers and dossier/proposal counts - => note: django optimizes out the chamber query for left pane - forms so this one actually does not add 1 to query count """ - home_queries = 10 + home_queries = 11 with self.assertNumQueries(self.left_pane_queries + home_queries): self.client.get(self.url) - - def test_rep_search_chambers(self): - self.selector_test('#form-rep #chamber-rep option') - - def test_rep_search_countries(self): - self.selector_test('#form-rep #country option') - - def test_rep_search_parties(self): - self.selector_test('#form-rep #party option') - - def test_rep_search_committee(self): - self.selector_test('#form-rep #committee option') - - def test_rep_search_delegation(self): - self.selector_test('#form-rep #delegation option') - - def test_dossier_search_chambers(self): - self.selector_test('#form-dossier #chamber-dossier option')