From 7f81451ab1c495b8bdf8ef19c0201be6ab277dbc Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 11 Oct 2022 20:43:55 +0900 Subject: [PATCH] test: fix dynamic properties --- tests/system/Filters/FiltersTest.php | 10 +++++----- tests/system/Filters/fixtures/GoogleMe.php | 4 ++-- tests/system/Filters/fixtures/GoogleYou.php | 4 ++-- tests/system/Filters/fixtures/Multiple1.php | 2 +- tests/system/Filters/fixtures/Multiple2.php | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php index b8d3e454dc00..2303eb4158b0 100644 --- a/tests/system/Filters/FiltersTest.php +++ b/tests/system/Filters/FiltersTest.php @@ -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() @@ -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() @@ -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() @@ -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() diff --git a/tests/system/Filters/fixtures/GoogleMe.php b/tests/system/Filters/fixtures/GoogleMe.php index 8fedc4312111..838e752e7bb5 100644 --- a/tests/system/Filters/fixtures/GoogleMe.php +++ b/tests/system/Filters/fixtures/GoogleMe.php @@ -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; } diff --git a/tests/system/Filters/fixtures/GoogleYou.php b/tests/system/Filters/fixtures/GoogleYou.php index 0ef4d0bb2f6d..456d10afab0e 100644 --- a/tests/system/Filters/fixtures/GoogleYou.php +++ b/tests/system/Filters/fixtures/GoogleYou.php @@ -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; } diff --git a/tests/system/Filters/fixtures/Multiple1.php b/tests/system/Filters/fixtures/Multiple1.php index 22f57e40184f..0a660db44141 100644 --- a/tests/system/Filters/fixtures/Multiple1.php +++ b/tests/system/Filters/fixtures/Multiple1.php @@ -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; } diff --git a/tests/system/Filters/fixtures/Multiple2.php b/tests/system/Filters/fixtures/Multiple2.php index 9b2e61f98938..12603dbc473a 100644 --- a/tests/system/Filters/fixtures/Multiple2.php +++ b/tests/system/Filters/fixtures/Multiple2.php @@ -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; }