Skip to content

test: fix dynamic properties in FiltersTest #6666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2022
Merged

test: fix dynamic properties in FiltersTest #6666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/system/Filters/FiltersTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ public function testRunDoesBefore()
$uri = 'admin/foo/bar';
$request = $filters->run($uri, 'before');

$this->assertSame('http://google.com', $request->url);
$this->assertSame('http://google.com', $request->getBody());
}

public function testRunDoesAfter()
Expand All @@ -519,7 +519,7 @@ public function testRunDoesAfter()
$uri = 'admin/foo/bar';
$response = $filters->run($uri, 'after');

$this->assertSame('http://google.com', $response->csp);
$this->assertSame('http://google.com', $response->getBody());
}

public function testShortCircuit()
Expand All @@ -540,7 +540,7 @@ public function testShortCircuit()
$response = $filters->run($uri, 'before');

$this->assertInstanceOf(ResponseInterface::class, $response);
$this->assertSame('http://google.com', $response->csp);
$this->assertSame('http://google.com', $response->getBody());
}

public function testOtherResult()
Expand Down Expand Up @@ -1103,8 +1103,8 @@ public function testFilterAliasMultiple()
$uri = 'admin/foo/bar';
$request = $filters->run($uri, 'before');

$this->assertSame('http://exampleMultipleURL.com', $request->url);
$this->assertSame('http://exampleMultipleCSP.com', $request->csp);
$this->assertSame('http://exampleMultipleURL.com', $request->header('x-url')->getValue());
$this->assertSame('http://exampleMultipleCSP.com', $request->header('x-csp')->getValue());
}

public function testFilterClass()
Expand Down
4 changes: 2 additions & 2 deletions tests/system/Filters/fixtures/GoogleMe.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ class GoogleMe implements FilterInterface
{
public function before(RequestInterface $request, $arguments = null)
{
$request->url = 'http://google.com';
$request->setBody('http://google.com');

return $request;
}

public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
{
$response->csp = 'http://google.com';
$response->setBody('http://google.com');

return $response;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/system/Filters/fixtures/GoogleYou.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ class GoogleYou implements FilterInterface
{
public function before(RequestInterface $request, $arguments = null)
{
$response = Services::response();
$response->csp = 'http://google.com';
$response = Services::response();
$response->setBody('http://google.com');

return $response;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Filters/fixtures/Multiple1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Multiple1 implements FilterInterface
{
public function before(RequestInterface $request, $arguments = null)
{
$request->csp = 'http://exampleMultipleCSP.com';
$request->setHeader('x-csp', 'http://exampleMultipleCSP.com');

return $request;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Filters/fixtures/Multiple2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Multiple2 implements FilterInterface
{
public function before(RequestInterface $request, $arguments = null)
{
$request->url = 'http://exampleMultipleURL.com';
$request->setHeader('x-url', 'http://exampleMultipleURL.com');

return $request;
}
Expand Down