mysociety / theyworkforyou

tests/FetchPageTestCase.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     protected function base_fetch_page($vars, $dir, $page = 'index.php', $req_uri = '')
     {
         foreach ($vars as $k => $v) {
-            $vars[$k] =  $k . '=' . urlencode($v);
+            $vars[$k] = $k.'='.urlencode($v);
         }
 
         if (!$req_uri) {
@@ -17,7 +17,7 @@ 
         }
 
         $vars = join('&', $vars);
-        $command = 'parse_str($argv[1], $_GET); include_once("tests/Bootstrap.php"); chdir("www/docs/' . $dir . '"); include_once("' . $page . '");';
+        $command = 'parse_str($argv[1], $_GET); include_once("tests/Bootstrap.php"); chdir("www/docs/'.$dir.'"); include_once("'.$page.'");';
         $page = `REQUEST_URI=$req_uri REMOTE_ADDR=127.0.0.1 php -e -r '$command' -- '$vars'`;
 
         return $page;

tests/PostcodeTest.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     /**
      * Test converting a postcode to a constituency
      */
-	public function testPostcodeToConstituency()
+    public function testPostcodeToConstituency()
     {
         $this->assertEquals(
             'Cities of London and Westminster',

tests/AlertsPageTest.php

Spacing +6 added lines, -6 removed lines

@@ -21,37 +21,37 @@
 
     public function testFetchPage()
     {
-        $page = $this->fetch_page( array() );
+        $page = $this->fetch_page(array());
         $this->assertContains('TheyWorkForYou Email Alerts', $page);
     }
 
     public function testKeywordOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'elephant'));
         $this->assertContains('Receive alerts when [elephant] is mentioned', $page);
     }
 
     public function testPostCodeOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE'));
         $this->assertContains('when Mrs Test Current-MP', $page);
     }
 
     public function testPostCodeWithKeyWord()
     {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by Mrs Test Current-MP', $page);
         $this->assertNotContains('by your MSP', $page);
     }
 
     public function testScottishPostcodeWithKeyword() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'PH6 2DB elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'PH6 2DB elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by your MP, Mr Test2 Current-MP', $page);
         $this->assertContains('Mentions of [elephant] by your MSP, Mrs Test Current-MSP', $page);
     }
 
     public function testPostcodeAndKeywordWithNoSittingMP() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'OX1 4LF elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'OX1 4LF elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertNotContains('Did you mean to get alerts for when your MP', $page);
     }

tests/DivisionsTest.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/divisions.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/divisions.xml');
     }
 
     private function fetch_page($vars)
@@ -17,17 +17,17 @@ 
     }
 
     private function fetch_division_page() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
     }
 
     private function fetch_mp_recent_page()
     {
-        $vars = array( 'pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent' );
+        $vars = array('pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent');
         return $this->base_fetch_page($vars, 'mp', 'index.php', '/mp/recent.php');
     }
 
     private function fetch_recent_page() {
-        return $this->base_fetch_page( array('url' => '/divisions' ), 'divisions', 'index.php', '/divisions/index.php' );
+        return $this->base_fetch_page(array('url' => '/divisions'), 'divisions', 'index.php', '/divisions/index.php');
     }
 
 
@@ -113,7 +113,7 @@ 
     }
 
     public function testNotEnoughInfoStatement() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
         $this->assertContains('we don’t have enough information to calculate Test Current-MP’s position', $page);
     }
 
@@ -124,7 +124,7 @@ 
     }
 
     public function testSingleDivision() {
-        $page = $this->base_fetch_page( array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons' ), 'divisions', 'division.php', '/divisions/division.php' );
+        $page = $this->base_fetch_page(array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons'), 'divisions', 'division.php', '/divisions/division.php');
         $this->assertContains('A majority of MPs  <b>voted in favour</b> of a thing', $page);
         $this->assertContains('198 for', $page);
         $this->assertContains('98 against', $page);

tests/CommentTest.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     /**
      * Ensures the database is prepared and the comment class is included for every test.
      */
-	public function setUp() {
+    public function setUp() {
 
         parent::setUp();
 

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
     public function testHTMLCleaningOfAngleBrackets() {
         $text = 'Is 2 < 3?';
 
-        $this->assertEquals('Is 2 &lt; 3?', filter_user_input( $text, 'comment' ) );
+        $this->assertEquals('Is 2 &lt; 3?', filter_user_input($text, 'comment'));
     }
 
     public function testHTMLCleaningWithNonASCIIChars()

tests/UserTest.php

Indentation +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
         );
 
         $expectedTable = $this->createXmlDataSet(dirname(__FILE__).'/_fixtures/expectedTokens.xml')
-                              ->getTable("tokens");
+                                ->getTable("tokens");
         $this->assertTablesEqual($expectedTable, $queryTable);
 
         $alertCount = $this->getConnection()->getRowCount('alerts', 'email = "user@example.org"');

Spacing +16 added lines, -16 removed lines

@@ -44,8 +44,8 @@ 
         $id = $u->user_id();
         $u->init($id);
 
-        $this->assertEquals( 'Test', $u->firstname() );
-        $this->assertEquals( 'EH1 99SP', $u->postcode() );
+        $this->assertEquals('Test', $u->firstname());
+        $this->assertEquals('EH1 99SP', $u->postcode());
     }
 
     public function testEditUser() {
@@ -53,9 +53,9 @@ 
         $u = new THEUSER();
         $u->loggedin = 1;
 
-        $this->assertEquals( 'Test', $u->firstname() );
+        $this->assertEquals('Test', $u->firstname());
 
-        $d = $u->update_self( array(
+        $d = $u->update_self(array(
             'firstname' => 'Experiment',
             'lastname' => 'User',
             'emailpublic' => '0',
@@ -64,9 +64,9 @@ 
             'url' => '',
             'optin' => '',
             'user_id' => 1
-        ) );
+        ));
 
-        $this->assertEquals( 'Experiment', $u->firstname() );
+        $this->assertEquals('Experiment', $u->firstname());
     }
 
     public function testEditUserEmail() {
@@ -74,9 +74,9 @@ 
         $u = new THEUSER();
         $u->loggedin = 1;
 
-        $this->assertEquals( 'user@example.org', $u->email() );
+        $this->assertEquals('user@example.org', $u->email());
 
-        $d = $u->update_self( array(
+        $d = $u->update_self(array(
             'firstname' => 'Experiment',
             'lastname' => 'User',
             'email' => 'user@example.com',
@@ -86,10 +86,10 @@ 
             'url' => '',
             'optin' => '',
             'user_id' => 1
-        ), false );
+        ), false);
 
         // email should not change as user needs to confirm
-        $this->assertEquals( 'user@example.org', $u->email() );
+        $this->assertEquals('user@example.org', $u->email());
 
         $tokenCount = $this->getConnection()->getRowCount('tokens', 'data = "1::user@example.com"');
         $this->assertEquals(1, $tokenCount, 'correct number of email confirm tokens');
@@ -111,11 +111,11 @@ 
         );
 
         $tokenRow = $queryTable->getRow(0);
-        $token = '2-' . $tokenRow['token'];
+        $token = '2-'.$tokenRow['token'];
 
-        $u->confirm_email($token,false);
+        $u->confirm_email($token, false);
 
-        $this->assertEquals( 'user@example.com', $u->email(), 'confirming with token updates email address' );
+        $this->assertEquals('user@example.com', $u->email(), 'confirming with token updates email address');
         $tokenCount = $this->getConnection()->getRowCount('tokens', 'data = "1::user@example.com"');
         $this->assertEquals(0, $tokenCount, 'token deleted once email confirmed');
 
@@ -131,15 +131,15 @@ 
         $u = new THEUSER();
         $u->loggedin = 1;
 
-        $this->assertEquals( 'user@example.org', $u->email(), 'confirming inital email address' );
+        $this->assertEquals('user@example.org', $u->email(), 'confirming inital email address');
 
         $tokenCount = $this->getConnection()->getRowCount('tokens', 'data = "1::user@example.net"');
         $this->assertEquals(1, $tokenCount, 'correct number of email confirm tokens');
 
         $token = '2-lkdsjafhsadjhf';
 
-        $u->confirm_email($token,false);
-        $this->assertEquals( 'user@example.org', $u->email(), 'expired token does not update email address' );
+        $u->confirm_email($token, false);
+        $this->assertEquals('user@example.org', $u->email(), 'expired token does not update email address');
 
         $tokenCount = $this->getConnection()->getRowCount('tokens', 'data = "1::user@example.net"');
         $this->assertEquals(1, $tokenCount, 'correct number of email confirm tokens');

tests/PageTest.php

Indentation +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
         $this->assertContains('<span class="party Lab">Labour</span>', $page);
     }
 
-	public function testSittingMLA()
+    public function testSittingMLA()
     {
         $page = $this->fetch_page( array( 'pid' => 4, 'url' => '/mp/4/test_current-mla/test_northern_ireland_constituency' ) );
         $this->assertContains('Test Current-MLA', $page);
@@ -63,7 +63,7 @@ 
     /**
      * Ensure that the Speaker is given the correct constituency.
      */
-	public function testSpeaker()
+    public function testSpeaker()
     {
         $page = $this->fetch_page( array( 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ) );
         $this->assertContains('<span class="party SPK">Speaker</span>', $page);

Spacing +11 added lines, -11 removed lines

@@ -21,14 +21,14 @@ 
 
     public function testQueenie()
     {
-        $page = $this->fetch_page( array( 'royal' => 1, 'n' => 'elizabeth_the_second' ) );
+        $page = $this->fetch_page(array('royal' => 1, 'n' => 'elizabeth_the_second'));
         $this->assertContains('Elizabeth the Second', $page);
         $this->assertContains('Coronated on 2 June 1953', $page);
     }
 
     public function testSittingMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency'));
         $this->assertContains('Test Current-MP', $page);
         $this->assertContains('<span class="constituency">Test Westminster Constituency</span>', $page);
         $this->assertContains('<span class="party Lab">Labour</span>', $page);
@@ -36,7 +36,7 @@ 
 
 	public function testSittingMLA()
     {
-        $page = $this->fetch_page( array( 'pid' => 4, 'url' => '/mp/4/test_current-mla/test_northern_ireland_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 4, 'url' => '/mp/4/test_current-mla/test_northern_ireland_constituency'));
         $this->assertContains('Test Current-MLA', $page);
         $this->assertContains('<span class="constituency">Test Northern Ireland Constituency</span>', $page);
         $this->assertContains('<span class="party SinnFéin">Sinn Féin</span>', $page);
@@ -47,7 +47,7 @@ 
      */
     public function testSittingSinnFeinMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency'));
         $this->assertContains('Sinn F&eacute;in MPs do not take their seats in Parliament.', $page);
     }
 
@@ -56,7 +56,7 @@ 
      */
     public function testSittingNonSinnFeinMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency'));
         $this->assertNotContains('Sinn F&eacute;in MPs do not take their seats in Parliament.', $page);
     }
 
@@ -65,7 +65,7 @@ 
      */
 	public function testSpeaker()
     {
-        $page = $this->fetch_page( array( 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ) );
+        $page = $this->fetch_page(array('pid' => 13, 'url' => '/mp/13/test_speaker/buckingham'));
         $this->assertContains('<span class="party SPK">Speaker</span>', $page);
     }
 
@@ -75,25 +75,25 @@ 
         # makes sure it is empty in case there's something hanging
         # about in memcached
         $banner->set_text('');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertNotContains('<div class="banner">', $page);
         $this->assertNotContains('This is a banner', $page);
 
         $banner->set_text('This is a banner');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertContains('This is a banner', $page);
 
         $banner->set_text('');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertNotContains('<div class="banner">', $page);
         $this->assertNotContains('This is a banner', $page);
     }
 
     public function testNewMPMessage() {
-        $page = $this->fetch_page( array( 'pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency'));
         $this->assertNotContains('is a recently elected MP', $page);
         $this->db->query('UPDATE member SET entered_house = NOW() WHERE person_id = 17');
-        $page = $this->fetch_page( array( 'pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency'));
         $this->assertContains('is a recently elected MP', $page);
     }
 

tests/GlossaryTest.php

Indentation +11 added lines, -11 removed lines

@@ -17,8 +17,8 @@ 
     /**
      * Ensures the database is prepared and the glossary class is included for every test.
      */
-	public function setUp()
-	{
+    public function setUp()
+    {
         parent::setUp();
         
         include_once('www/includes/easyparliament/glossary.php');
@@ -27,10 +27,10 @@ 
     /**
      * Test that glossarising a single word works as expected.
      */
-	public function testGlossariseNormal()
+    public function testGlossariseNormal()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('<a href="/glossary/?gl=1" title="In a general election, each Constituency chooses an MP to represent them...." class="glossary">constituency</a>', $glossary->glossarise('constituency'));
     }
@@ -41,7 +41,7 @@ 
     public function testGlossariseInLink()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('<a href="#">constituency</a>', $glossary->glossarise('<a href="#">constituency</a>'));
     }
@@ -52,7 +52,7 @@ 
     public function testGlossariseInString()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('fooconstituencybar', $glossary->glossarise('fooconstituencybar'));
     }
@@ -63,7 +63,7 @@ 
     public function testGlossariseInSpacedString()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('foo <a href="/glossary/?gl=1" title="In a general election, each Constituency chooses an MP to represent them...." class="glossary">constituency</a> bar', $glossary->glossarise('foo constituency bar'));
     }
@@ -74,7 +74,7 @@ 
     public function testWikipediaLinkNormal()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('<a href="https://en.wikipedia.org/wiki/MP">MP</a>', $glossary->glossarise('MP'));
     }
@@ -85,7 +85,7 @@ 
     public function testWikipediaLinkInLink()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('<a href="#">MP</a>', $glossary->glossarise('<a href="#">MP</a>'));
     }
@@ -96,7 +96,7 @@ 
     public function testWikipediaLinkInString()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('fooMPbar', $glossary->glossarise('fooMPbar'));
     }
@@ -107,7 +107,7 @@ 
     public function testWikipediaLinkInSpacedString()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('foo <a href="https://en.wikipedia.org/wiki/MP">MP</a> bar', $glossary->glossarise('foo MP bar'));
     }

tests/Bootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
 // TWFY Test Bootstrapper
 
 // Go get the Composer autoloader to make sure we've got the right PHPUnit extensions.
-require_once(dirname(__FILE__) . '/../vendor/autoload.php');
+require_once(dirname(__FILE__).'/../vendor/autoload.php');
 
 // Test to make sure we have the test DB environment variables. If not, this isn't testing, so abort.
 // Define the DB connection constants before we do anything else.
@@ -21,14 +21,14 @@ 
     define('OPTION_TWFY_DB_NAME', $_SERVER['TWFY_TEST_DB_NAME']);
     
     // Define the base directory
-    define ("BASEDIR", dirname(__FILE__) . '/../www/docs'); 
+    define("BASEDIR", dirname(__FILE__).'/../www/docs'); 
 
     # point to the default mapit
     define('OPTION_MAPIT_URL', 'https://mapit.mysociety.org/');
 
     // If there isn't a config file (most likely this is running an automated test) copy one in.
-    if ( ! file_exists(dirname(__FILE__) . '/../conf/general')) {
-        copy(dirname(__FILE__) . '/../conf/general-example', dirname(__FILE__) . '/../conf/general');
+    if (!file_exists(dirname(__FILE__).'/../conf/general')) {
+        copy(dirname(__FILE__).'/../conf/general-example', dirname(__FILE__).'/../conf/general');
     }
 
 } else {

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@ 
 // Test to make sure we have the test DB environment variables. If not, this isn't testing, so abort.
 // Define the DB connection constants before we do anything else.
 if (
-    isset($_SERVER['TWFY_TEST_DB_HOST']) AND
-    isset($_SERVER['TWFY_TEST_DB_USER']) AND
-    isset($_SERVER['TWFY_TEST_DB_PASS']) AND
+    isset($_SERVER['TWFY_TEST_DB_HOST']) and
+    isset($_SERVER['TWFY_TEST_DB_USER']) and
+    isset($_SERVER['TWFY_TEST_DB_PASS']) and
     isset($_SERVER['TWFY_TEST_DB_NAME'])
 ) {
 
@@ -37,7 +37,7 @@ 
 }
 
 // Explicitly declare we're in testing (avoids trying deploy-only things)
-define('TESTING', TRUE);
+define('TESTING', true);
 
 // Load up the init script (handles the rest of the config, DB connection etc)
 include_once('www/includes/easyparliament/init.php');