Move the notmodified check to middleware where it belongs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

2 files changed, 1 insertions, 41 deletions

diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php
index 74dbf68c28a..c4c973aec90 100644
--- a/tests/lib/AppFramework/Http/DispatcherTest.php
+++ b/tests/lib/AppFramework/Http/DispatcherTest.php
@@ -181,19 +181,11 @@ class DispatcherTest extends \Test\TestCase {
 			->method('getStatus')
 			->willReturn(Http::STATUS_OK);
 		$this->response->expects($this->once())
-			->method('getLastModified')
-			->willReturn($this->lastModified);
-		$this->response->expects($this->once())
-			->method('getETag')
-			->willReturn($this->etag);
-		$this->response->expects($this->once())
 			->method('getHeaders')
 			->willReturn($responseHeaders);
 		$this->http->expects($this->once())
 			->method('getStatusHeader')
-			->with($this->equalTo(Http::STATUS_OK),
-				$this->equalTo($this->lastModified),
-				$this->equalTo($this->etag))
+			->with($this->equalTo(Http::STATUS_OK))
 			->willReturn($httpHeaders);
 
 		$this->middlewareDispatcher->expects($this->once())
diff --git a/tests/lib/AppFramework/Http/HttpTest.php b/tests/lib/AppFramework/Http/HttpTest.php
index 009bb39260d..d3d23425f7c 100644
--- a/tests/lib/AppFramework/Http/HttpTest.php
+++ b/tests/lib/AppFramework/Http/HttpTest.php
@@ -53,38 +53,6 @@ class HttpTest extends \Test\TestCase {
 		$this->assertEquals('HTTP/1.0 200 OK', $header);
 	}
 
-
-	public function testEtagMatchReturnsNotModified() {
-		$http = new Http(['HTTP_IF_NONE_MATCH' => 'hi']);
-
-		$header = $http->getStatusHeader(Http::STATUS_OK, null, 'hi');
-		$this->assertEquals('HTTP/1.1 304 Not Modified', $header);
-	}
-
-
-	public function testQuotedEtagMatchReturnsNotModified() {
-		$http = new Http(['HTTP_IF_NONE_MATCH' => '"hi"']);
-
-		$header = $http->getStatusHeader(Http::STATUS_OK, null, 'hi');
-		$this->assertEquals('HTTP/1.1 304 Not Modified', $header);
-	}
-
-
-	public function testLastModifiedMatchReturnsNotModified() {
-		$dateTime = new \DateTime(null, new \DateTimeZone('GMT'));
-		$dateTime->setTimestamp('12');
-
-		$http = new Http(
-			[
-				'HTTP_IF_MODIFIED_SINCE' => 'Thu, 01 Jan 1970 00:00:12 +0000']
-			);
-
-		$header = $http->getStatusHeader(Http::STATUS_OK, $dateTime);
-		$this->assertEquals('HTTP/1.1 304 Not Modified', $header);
-	}
-
-
-
 	public function testTempRedirectBecomesFoundInHttp10() {
 		$http = new Http([], 'HTTP/1.0');