Merge pull request #8652 from nextcloud/navigation-controller-etag

Add ETag to NavigationController

1 files changed, 31 insertions, 0 deletions

diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php
index 1143ed003f0..86173405c1c 100644
--- a/tests/Core/Controller/NavigationControllerTest.php
+++ b/tests/Core/Controller/NavigationControllerTest.php
@@ -23,6 +23,7 @@
 namespace Tests\Core\Controller;
 
 use OC\Core\Controller\NavigationController;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\INavigationManager;
 use OCP\IRequest;
@@ -126,4 +127,34 @@ class NavigationControllerTest extends TestCase {
 		}
 	}
 
+	public function testGetAppNavigationEtagMatch() {
+		$navigation = [ ['id' => 'files', 'href' => '/index.php/apps/files', 'icon' => 'icon' ] ];
+		$this->request->expects($this->once())
+			->method('getHeader')
+			->with('If-None-Match')
+			->willReturn(md5(json_encode($navigation)));
+		$this->navigationManager->expects($this->once())
+			->method('getAll')
+			->with('link')
+			->willReturn($navigation);
+			$actual = $this->controller->getAppsNavigation();
+			$this->assertInstanceOf(DataResponse::class, $actual);
+			$this->assertEquals(Http::STATUS_NOT_MODIFIED, $actual->getStatus());
+	}
+
+	public function testGetSettingsNavigationEtagMatch() {
+		$navigation = [ ['id' => 'logout', 'href' => '/index.php/apps/files', 'icon' => 'icon' ] ];
+		$this->request->expects($this->once())
+			->method('getHeader')
+			->with('If-None-Match')
+			->willReturn(md5(json_encode([ ['id' => 'logout', 'href' => 'logout', 'icon' => 'icon' ] ])));
+		$this->navigationManager->expects($this->once())
+			->method('getAll')
+			->with('settings')
+			->willReturn($navigation);
+		$actual = $this->controller->getSettingsNavigation();
+		$this->assertInstanceOf(DataResponse::class, $actual);
+		$this->assertEquals(Http::STATUS_NOT_MODIFIED, $actual->getStatus());
+	}
+
 }