From 263edf4f80d95d6f81a259524d002ef51b99e0ee Mon Sep 17 00:00:00 2001
From: Sebastian Lobinger <sebastian.lobinger@zib.de>
Date: Fri, 28 Jul 2017 12:12:05 +0200
Subject: [PATCH] extend test_menu_list_provided to reflect new state of issue
#29
the test checks that the appAlias is also provides by menu context
processor of the hub
changed files:
test/test_sams_hub.py
---
test/test_sams_hub.py | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/test/test_sams_hub.py b/test/test_sams_hub.py
index 673b533..eed5b4d 100644
--- a/test/test_sams_hub.py
+++ b/test/test_sams_hub.py
@@ -18,12 +18,12 @@ class CaseSAMSHubWithThreadedAPI(unittest.TestCase):
apiApp.config['TESTING'] = True
thApi = FlaskInThread(apiApp, host="localhost", port=4711)
thApi.start()
- time.sleep(0.01)
+ time.sleep(1)
def tearDown(self):
response = requests.get('http://localhost:4711/shutdown')
print(response.content.decode('utf-8'))
- time.sleep(0.01)
+ time.sleep(1)
def test_hub_provides_apps_with_proxies(self):
manifest = {
@@ -223,14 +223,7 @@ class CaseMinimalSAMSHub(unittest.TestCase):
]
urls = ['1/1', '2/1', '1/2']
name_vars = ['1_1', '2_1', '1_2']
- expected = ''.join((
- "<ul>\n\n<li><a href='/", name, '/', urls[0], "'>", expected_names[0],
- "</a>\n\n<ul>\n\n<li><a href='/", name, '/', urls[1], "'>", expected_names[1],
- "</a>\n\n</li>\n\n</ul>\n\n</li>\n\n<li><a href='/", name, '/', urls[2], "'>",
- expected_names[2], '</a>\n\n</li>\n\n</ul>'
- ))
- self.hub.addApp(
- SAMSApp(
+ testSamsApp = SAMSApp(
name = name, manifest = {
'default_language': 'de',
'views': [{'url': 'test-menu','function': 'views.menu_test'}],
@@ -242,13 +235,25 @@ class CaseMinimalSAMSHub(unittest.TestCase):
]
}
, langDict = {'de': dict(zip(name_vars, expected_names))}
- )
)
- self.hub.flaskApp.config['DEBUG'] = True
- with self.hub.flaskApp.test_client(self) as client:
- response = client.get('/test/test-menu')
- self.assertIs(response.status_code, 200)
- self.assertEquals(response.data.decode('utf-8'), expected)
+ for addAppParams in (
+ {'app': testSamsApp}, {'app': testSamsApp, 'alias': 'testAlias'}):
+ hub = SAMSHub(name = 'test', config = {'default_language': 'de'})
+ effectiveName = addAppParams.get('alias', name)
+ expected = ''.join((
+ "<ul>\n\n<li><a href='/", effectiveName, '/', urls[0], "'>",
+ expected_names[0], "</a>\n\n<ul>\n\n<li><a href='/", effectiveName,
+ '/', urls[1], "'>", expected_names[1],
+ "</a>\n\n</li>\n\n</ul>\n\n</li>\n\n<li><a href='/", effectiveName, '/',
+ urls[2], "'>", expected_names[2], '</a>\n\n</li>\n\n</ul>'
+ ))
+ hub.addApp(**addAppParams)
+ hub.flaskApp.config['DEBUG'] = True
+ with hub.flaskApp.test_client(self) as client:
+ response = client.get('/' + effectiveName + '/test-menu')
+ with self.subTest(addAppParams):
+ self.assertIs(response.status_code, 200)
+ self.assertEquals(response.data.decode('utf-8'), expected)
def test_hub_default_language_used(self):
"""The hub default_language is prefered instead of app default_language"""
--
GitLab