Merge pull request #70 from 18F/committee_singular

Changed committee page route to singular

__init__.py

@@ -41,7 +41,7 @@ def candidate_page(c_id):
     data = load_single_type('candidate', c_id)
     return render_page('candidate', data)
 
-@app.route('/committees/<c_id>')
+@app.route('/committee/<c_id>')
 def committee_page(c_id):
     data = load_single_type('committee', c_id)
     return render_page('committee', data)

openfecwebapp/tests/data_prep/candidates_tests.py

@@ -13,7 +13,7 @@ def create_app(self):
         def candidates():
             pass
 
-        @app.route('/committees/<c_id>')
+        @app.route('/committee/<c_id>')
         def committee_page():
             pass
 
@@ -29,7 +29,7 @@ def test_map_candidate_page_values(self):
         self.assertEqual('D1234', vals['primary_committee']['id'])
         self.assertEqual('Friends of McPersonson', 
             vals['primary_committee']['name'])
-        self.assertEqual('/committees/D1234',
+        self.assertEqual('/committee/D1234',
             vals['primary_committee']['url'])
 
         self.assertEqual('D1234', vals['authorized_committees'][
@@ -38,5 +38,5 @@ def test_map_candidate_page_values(self):
             vals['authorized_committees']['D1234']['name'])
         self.assertEqual('Authorized committee',
             vals['authorized_committees']['D1234']['designation'])
-        self.assertEqual('/committees/D1234',
+        self.assertEqual('/committee/D1234',
             vals['authorized_committees']['D1234']['url'])

openfecwebapp/tests/selenium/single_candidate_page.py

@@ -14,14 +14,6 @@ def testSingleCandidatePageLoads(self):
 
     def testCommitteeLink(self):
         self.driver.get(self.url)
-        self.assertEqual(
-            self.elementExistsByXPath(
-                '//a[contains(@href, "committees/")]'),
-            True)
-        if self.elementExistsByXPath(
-                '//a[contains(@href, "committees/")]'):
-            link = self.driver.find_element_by_xpath(
-                '//a[contains(@href, "committees/")]')
-            self.assertEqual(
-                link.text,
-                'COMMITTEE TO ELECT MARK ALLIEGRO')
+        self.assertTrue(self.elementExistsByXPath('//a[contains(@href, "committee/")]'))
+        link = self.driver.find_element_by_xpath('//a[contains(@href, "committees/")]')
+        self.assertEqual(link.text, 'COMMITTEE TO ELECT MARK ALLIEGRO')

openfecwebapp/tests/selenium/single_committee_page.py

@@ -4,7 +4,7 @@
 class SingleCommitteePageTests(BaseTest):
 
     def setUp(self):
-        self.url = self.base_url + '/committees/C00550715'
+        self.url = self.base_url + '/committee/C00550715'
 
     def testSingleCommitteePageLoads(self):
         self.driver.get(self.url)