Merge ~ack/maas:offline-docs-append-html into maas:master

[Alberto Donato]

LP: #1898679 - serve the file with ".html" extension if resource without extension is requested

[Adam Collard (adam-collard)]

Can you add a test for a missing image or other static (non-html) resource>

[Adam Collard (adam-collard)]

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b offline-docs-append-html lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 0ec05f4604d405fb724ff0cf54e283d872e726d0

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b offline-docs-append-html lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8540/console
COMMIT: 8de5d455ca2823731d743f9aaa2e54c3711b0554

review: Needs Fixing

diff --git a/src/maasserver/tests/test_webapp.py b/src/maasserver/tests/test_webapp.py
index 04121d2..3edc12a 100644
--- a/src/maasserver/tests/test_webapp.py
+++ b/src/maasserver/tests/test_webapp.py
@@ -1,11 +1,8 @@
 # Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# TODO: Description here.
-"""..."""
-
-__all__ = []
 
+from pathlib import Path
 import random
 from unittest.mock import sentinel
 
@@ -20,14 +17,53 @@ from twisted.web.test.requesthelper import DummyChannel, DummyRequest
 
 from maasserver import eventloop, webapp
 from maasserver.testing.listener import FakePostgresListenerService
-from maasserver.webapp import OverlaySite
+from maasserver.webapp import DocsFallbackFile, OverlaySite
 from maasserver.websockets.protocol import WebSocketFactory
 from maastesting.factory import factory
+from maastesting.fixtures import TempDirectory
 from maastesting.matchers import MockCalledOnceWith
 from maastesting.testcase import MAASTestCase
 from provisioningserver.utils.twisted import reducedWebLogFormatter
 
 
+class TestDocsFallbackFile(MAASTestCase):
+    def setUp(self):
+        super().setUp()
+        self.base_dir = self.useFixture(TempDirectory())
+        self.docs = DocsFallbackFile(self.base_dir.path)
+
+    def touch_file(self, path):
+        Path(self.base_dir.join(path)).touch()
+
+    def test_html_404(self):
+        request = DummyRequest([b"foo.html"])
+        resource = self.docs.getChild(b"foo.html", request)
+        self.assertTrue(resource.path.endswith("404.html"))
+
+    def test_other_404(self):
+        request = DummyRequest([b"foo.jpg"])
+        resource = self.docs.getChild(b"foo.jpg", request)
+        self.assertTrue(resource.path.endswith("404.html"))
+
+    def test_html_resource(self):
+        self.touch_file("foo.html")
+        request = DummyRequest([b"foo.html"])
+        resource = self.docs.getChild(b"foo.html", request)
+        self.assertTrue(resource.path.endswith("foo.html"))
+
+    def test_other_resource(self):
+        self.touch_file("foo.jpg")
+        request = DummyRequest([b"foo.jpg"])
+        resource = self.docs.getChild(b"foo.jpg", request)
+        self.assertTrue(resource.path.endswith("foo.jpg"))
+
+    def test_append_html(self):
+        self.touch_file("foo.html")
+        request = DummyRequest([b"foo"])
+        resource = self.docs.getChild(b"foo", request)
+        self.assertTrue(resource.path.endswith("foo.html"))
+
+
 class TestCleanPathRequest(MAASTestCase):
     def test_requestReceived_converts_extra_slashes_to_single(self):
         mock_super_requestReceived = self.patch(
diff --git a/src/maasserver/webapp.py b/src/maasserver/webapp.py
index 8952914..9828bab 100644
--- a/src/maasserver/webapp.py
+++ b/src/maasserver/webapp.py
@@ -181,6 +181,12 @@ class DocsFallbackFile(NoListingFile):
         super().__init__(*args, **kwargs)
         self.childNotFound = DefaultFile(self.child(fallback).path)
 
+    def getChild(self, path, request):
+        child = super().getChild(path, request)
+        if child is self.childNotFound and not path.endswith(b".html"):
+            child = super().getChild(path + b".html", request)
+        return child
+
 
 class WebApplicationService(StreamServerEndpointService):
     """Service encapsulating the Django web application.