tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Remove regex in favour of simple assertContains

Browse Source
This commit is contained in:
Dan Hensby 2018-09-26 00:36:58 +01:00
parent cb361e8caf
commit 6b618b44c9
No known key found for this signature in database
GPG Key ID: 3906B235643EF10B
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/php/Control/ControllerTest.php
View File

@ -59,7 +59,7 @@ class ControllerTest extends FunctionalTest
{ {
/* For a controller with a template, the default action will simple run that template. */ /* For a controller with a template, the default action will simple run that template. */
$response = $this->get("TestController/"); $response = $this->get("TestController/");
$this->assertRegExp("/This is the main template. Content is 'default content'/", $response->getBody()); $this->assertContains("This is the main template. Content is 'default content'", $response->getBody());
} }
public function testMethodActions() public function testMethodActions()
@ -67,19 +67,19 @@ class ControllerTest extends FunctionalTest
/* The Action can refer to a method that is called on the object. If a method returns an array, then it /* The Action can refer to a method that is called on the object. If a method returns an array, then it
* will be used to customise the template data */ * will be used to customise the template data */
$response = $this->get("TestController/methodaction"); $response = $this->get("TestController/methodaction");
$this->assertRegExp("/This is the main template. Content is 'methodaction content'./", $response->getBody()); $this->assertContains("This is the main template. Content is 'methodaction content'.", $response->getBody());
/* If the method just returns a string, then that will be used as the response */ /* If the method just returns a string, then that will be used as the response */
$response = $this->get("TestController/stringaction"); $response = $this->get("TestController/stringaction");
$this->assertRegExp("/stringaction was called./", $response->getBody()); $this->assertContains("stringaction was called.", $response->getBody());
} }
public function testTemplateActions() public function testTemplateActions()
{ {
/* If there is no method, it can be used to point to an alternative template. */ /* If there is no method, it can be used to point to an alternative template. */
$response = $this->get("TestController/templateaction"); $response = $this->get("TestController/templateaction");
$this->assertRegExp( $this->assertContains(
"/This is the template for templateaction. Content is 'default content'./", "This is the template for templateaction. Content is 'default content'.",
$response->getBody() $response->getBody()
); );
} }