re-add integration tests (bad merge) and add integration test for nulbyte check when asset spec override exists

1 files changed, 17 insertions, 5 deletions

diff --git a/tests/test_integration.py b/tests/test_integration.py
index 184368214..d14ee846e 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -220,18 +220,30 @@ class TestEventOnlySubscribers(IntegrationBase, unittest.TestCase):
 class TestStaticAppUsingAbsPath(StaticAppBase, unittest.TestCase):
     package = 'tests.pkgs.static_abspath'
 
-    def test_nulbyte_chroot(self):
-        super_w_null = '/static/..\x00/'
-        res = self.testapp.get(f'/{super_w_null}', status=404)
-
 
 class TestStaticAppUsingAssetSpec(StaticAppBase, unittest.TestCase):
     package = 'tests.pkgs.static_assetspec'
 
+
+class TestStaticAppUsingAbsPathNulByte(IntegrationBase, unittest.TestCase):
+    package = 'tests.pkgs.static_abspath_nulbyte'
+
     def test_nulbyte_chroot(self):
-        super_w_null = 'static/..\x00/'
+        super_w_null = '..\x00/'
         res = self.testapp.get(f'/{super_w_null}', status=404)
 
+class TestStaticAppUsingAssetSpecNulByte(IntegrationBase, unittest.TestCase):
+    package = 'tests.pkgs.static_assetspec_nulbyte'
+
+    def test_nulbyte_chroot(self):
+        super_w_null = '..\x00/'
+        res = self.testapp.get(f'/{super_w_null}', status=404)
+
+    def test_nulbyte_chroot_assetspec_override(self):
+        super_w_null = '..\x00/'
+        res = self.testapp.get(f'/sub/{super_w_null}', status=404)
+
+
 class TestStaticAppWithEncodings(IntegrationBase, unittest.TestCase):
     package = 'tests.pkgs.static_encodings'