gordonbanderson / silverstripe-elastica

tests/ElasticSearchPageControllerTest.php

Indentation +22 added lines, -22 removed lines

@@ -74,11 +74,11 @@ 
 		$this->assertEquals(200, $searchPage->getStatusCode());
 		$url = rtrim($url, '/');
 
-        $response = $this->get($url);
-        error_log(print_r($response,1));
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		error_log(print_r($response,1));
+		$this->assertEquals(200, $response->getStatusCode());
 
-        $this->assertSelectorStartsWithOrEquals('span.count', 0, '(5)');
+		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(5)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(11)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(12)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 3, '(13)');
@@ -128,11 +128,11 @@ 
 		$url = rtrim($url, '/');
 		$url .= '?ISO=400';
 
-        $response = $this->get($url);
-        error_log(print_r($response,1));
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		error_log(print_r($response,1));
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the no facets selected case, as expected
+		// These are less than in the no facets selected case, as expected
 		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(2)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(2)');
@@ -176,12 +176,12 @@ 
 		$url = rtrim($url, '/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250';
 
-        $response = $this->get($url);
-        error_log(print_r($response,1));
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		error_log(print_r($response,1));
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the one facet selected case, as expected
-        $this->assertSelectorStartsWithOrEquals('span.count', 0, '(1)');
+		// These are less than in the one facet selected case, as expected
+		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(2)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 3, '(1)');
@@ -210,11 +210,11 @@ 
 		$url = rtrim($url, '/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250&Aspect=Vertical';
 
-        $response = $this->get($url);
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the one facet selected case, as expected
-        $this->assertSelectorStartsWithOrEquals('span.count', 0, '(2)');
+		// These are less than in the one facet selected case, as expected
+		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(2)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(1)');
 	}
@@ -551,13 +551,13 @@ 
 		$searchPage = $this->get($searchPageObj->URLSegment);
 		$this->assertEquals(200, $searchPage->getStatusCode());
 
-        $response = $this->submitForm("ElasticSearchForm_SearchForm", null, array(
-            'q' => 'New Zealand'
-        ));
+		$response = $this->submitForm("ElasticSearchForm_SearchForm", null, array(
+			'q' => 'New Zealand'
+		));
 
 		$url = rtrim($url, '/');
-        $this->assertEquals(302, $response->getStatusCode());
-        $this->assertEquals($url . '?q=New Zealand&sfid=testwithagg', $response->getHeader('Location'));
+		$this->assertEquals(302, $response->getStatusCode());
+		$this->assertEquals($url . '?q=New Zealand&sfid=testwithagg', $response->getHeader('Location'));
 	}
 
 

Spacing +11 added lines, -11 removed lines

@@ -75,7 +75,7 @@ 
 		$url = rtrim($url, '/');
 
         $response = $this->get($url);
-        error_log(print_r($response,1));
+        error_log(print_r($response, 1));
         $this->assertEquals(200, $response->getStatusCode());
 
         $this->assertSelectorStartsWithOrEquals('span.count', 0, '(5)');
@@ -129,7 +129,7 @@ 
 		$url .= '?ISO=400';
 
         $response = $this->get($url);
-        error_log(print_r($response,1));
+        error_log(print_r($response, 1));
         $this->assertEquals(200, $response->getStatusCode());
 
         // These are less than in the no facets selected case, as expected
@@ -177,7 +177,7 @@ 
 		$url .= '?ISO=400&ShutterSpeed=2%2F250';
 
         $response = $this->get($url);
-        error_log(print_r($response,1));
+        error_log(print_r($response, 1));
         $this->assertEquals(200, $response->getStatusCode());
 
         // These are less than in the one facet selected case, as expected
@@ -249,7 +249,7 @@ 
 	public function testQueryInSearchBoxForOneFormOnly() {
 		$searchPageObj = $this->ElasticSearchPage2;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url .= "?q=Auckland&sfid=".$searchPageObj->Identifier;
+		$url .= "?q=Auckland&sfid=" . $searchPageObj->Identifier;
 		$response = $this->get($url);
 		$this->assertEquals(200, $response->getStatusCode());
 		$this->assertAttributeHasExactValue('#ElasticSearchForm_SearchForm_q', 'q',
@@ -382,7 +382,7 @@ 
 		$url .= "/similar/FlickrPhotoTO/77";
 		$response = $this->get($url);
 
-		error_log(print_r($response,1));
+		error_log(print_r($response, 1));
 
 		//Title of the original is "[Texas and New Orleans, Southern Pacific Railroad Station, Sierra Blanca, Texas]"
 		$this->assertSelectorStartsWithOrEquals('div.searchResult a', 0, '[ and New Orleans, Southern Pacific Railroad Station, Sinton, ]');
@@ -417,7 +417,7 @@ 
 		$url = rtrim($searchPageObj->Link(), '/');
 		$url .= "?q=New%20Zealind&TestMode=true";
 		$response = $this->get($url);
-		error_log(print_r($response,1));
+		error_log(print_r($response, 1));
 		$this->assertEquals(200, $response->getStatusCode());
 		$this->assertSelectorStartsWithOrEquals('p.showingResultsForMsg', 0, 'Showing results for ');
 		$this->assertSelectorStartsWithOrEquals('p.showingResultsForMsg a', 0, 'New ');
@@ -510,7 +510,7 @@ 
 		//Note pages need to be published, by default fixtures only reside in Stage
 		$searchPageObj = $this->ElasticSearchPage2;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url = $url.'?q='.$searchTerm;
+		$url = $url . '?q=' . $searchTerm;
 		$response = $this->get($url);
 		$this->assertEquals(200, $response->getStatusCode());
 
@@ -577,7 +577,7 @@ 
 		//Note pages need to be published, by default fixtures only reside in Stage
 		$searchPageObj = $this->ElasticSearchPage;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url = $url.'?q='.$searchTerm;
+		$url = $url . '?q=' . $searchTerm;
 		$response = $this->get($url);
 		$this->assertEquals(200, $response->getStatusCode());
 
@@ -708,18 +708,18 @@ 
 		//increase the number of results and assert that they are the same as per pages 1,2 joined
 		$searchPageObj->ResultsPerPage = 20;
 		$searchPageObj->write();
-		$searchPageObj->publish('Stage','Live');
+		$searchPageObj->publish('Stage', 'Live');
 		$response3 = $this->get($firstPageURL);
 	}
 
 
 	private function enableHighlights() {
-		foreach (SearchableField::get()->filter('Name', 'Title') as $sf) {
+		foreach(SearchableField::get()->filter('Name', 'Title') as $sf) {
 			$sf->ShowHighlights = true;
 			$sf->write();
 		}
 
-		foreach (SearchableField::get()->filter('Name', 'Content') as $sf) {
+		foreach(SearchableField::get()->filter('Name', 'Content') as $sf) {
 			$sf->ShowHighlights = true;
 			$sf->write();
 		}