From 83b5c95934e942b42d216f7ebf874463e2238b01 Mon Sep 17 00:00:00 2001 From: Nicolas Joyard Date: Fri, 14 Oct 2016 21:17:21 +0200 Subject: [PATCH] Update tests --- src/memopol/tests/base.py | 8 +- ...eTest.test_dossier_search_chambers.content | 13 - ...Test.test_dossier_search_chambers.metadata | 3 - ...nPaneTest.test_rep_search_chambers.content | 13 - ...PaneTest.test_rep_search_chambers.metadata | 3 - ...PaneTest.test_rep_search_committee.content | 201 ---- ...aneTest.test_rep_search_committee.metadata | 3 - ...PaneTest.test_rep_search_countries.content | 61 -- ...aneTest.test_rep_search_countries.metadata | 3 - ...aneTest.test_rep_search_delegation.content | 969 ------------------ ...neTest.test_rep_search_delegation.metadata | 3 - ...onPaneTest.test_rep_search_parties.content | 116 --- ...nPaneTest.test_rep_search_parties.metadata | 3 - ...t_home_navigation_pane.py => test_home.py} | 26 +- 14 files changed, 4 insertions(+), 1421 deletions(-) delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_dossier_search_chambers.content delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_dossier_search_chambers.metadata delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_chambers.content delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_chambers.metadata delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_committee.content delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_committee.metadata delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_countries.content delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_countries.metadata delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_delegation.content delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_delegation.metadata delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_parties.content delete mode 100644 src/memopol/tests/response_fixtures/NavigationPaneTest.test_rep_search_parties.metadata rename src/memopol/tests/{test_home_navigation_pane.py => test_home.py} (52%) diff --git a/src/memopol/tests/base.py b/src/memopol/tests/base.py index f7029ca..d360765 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 53a68d5..0000000 --- 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 a2e0a69..0000000 --- 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 53a68d5..0000000 --- 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 a2e0a69..0000000 --- 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 d6c978f..0000000 --- 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 a2e0a69..0000000 --- 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 d62645c..0000000 --- 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 a2e0a69..0000000 --- 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 d0de9df..0000000 --- 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 a2e0a69..0000000 --- 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 4c02a5f..0000000 --- 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 a2e0a69..0000000 --- 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 bba8efe..bf4fd5f 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') -- GitLab