diff options
author | Tristan Cacqueray <tdecacqu@redhat.com> | 2018-10-03 07:05:06 +0000 |
---|---|---|
committer | Monty Taylor <mordred@inaugust.com> | 2018-10-06 10:42:31 -0500 |
commit | 68d11898715970f47c4d86c261dc64232a841c85 (patch) | |
tree | 974b0e60a21d8262b67c0310777d14ee48c056f5 /tests/unit/test_web_urls.py | |
parent | 6f0f36aab00104321d548554f74e969064b1fe34 (diff) | |
download | zuul-68d11898715970f47c4d86c261dc64232a841c85.tar.gz |
Revert "Revert "web: rewrite interface in react""
This reverts commit 3dba813c643ec8f4b3323c2a09c6aecf8ad4d338.
Change-Id: I233797a9b4e3485491c49675da2c2efbdba59449
Diffstat (limited to 'tests/unit/test_web_urls.py')
-rw-r--r-- | tests/unit/test_web_urls.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/unit/test_web_urls.py b/tests/unit/test_web_urls.py index f187c7291..54eee1bda 100644 --- a/tests/unit/test_web_urls.py +++ b/tests/unit/test_web_urls.py @@ -51,10 +51,8 @@ class TestWebURLs(ZuulTestCase): ]: for item in page.find_all(tag): suburl = item.get(attr) - # Skip empty urls. Also skip the navbar relative link for now. - # TODO(mordred) Remove when we have the top navbar link sorted. - if suburl is None or suburl == "../": - continue + if suburl.startswith('/'): + suburl = suburl[1:] link = urllib.parse.urljoin(url, suburl) self._get(self.port, link) @@ -66,7 +64,8 @@ class TestDirect(TestWebURLs): self.port = self.web.port def test_status_page(self): - self._crawl('/t/tenant-one/status.html') + self._crawl('/') + self._crawl('/t/tenant-one/status') class TestWhiteLabel(TestWebURLs): @@ -81,7 +80,8 @@ class TestWhiteLabel(TestWebURLs): self.port = self.proxy.port def test_status_page(self): - self._crawl('/status.html') + self._crawl('/') + self._crawl('/status') class TestWhiteLabelAPI(TestWebURLs): @@ -108,11 +108,11 @@ class TestSuburl(TestWebURLs): def setUp(self): super(TestSuburl, self).setUp() rules = [ - ('^/zuul3/(.*)$', 'http://localhost:{}/\\1'.format( + ('^/zuul/(.*)$', 'http://localhost:{}/\\1'.format( self.web.port)), ] self.proxy = self.useFixture(WebProxyFixture(rules)) self.port = self.proxy.port def test_status_page(self): - self._crawl('/zuul3/t/tenant-one/status.html') + self._crawl('/zuul/') |