Fixed issue where when we were unzipping the files we were unzipping …

…legacy and scripting to the same directory
FamilySearch · Oct 4, 2023 · bf60832 · bf60832
1 parent 68dad10
commit bf60832
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/controller/.gitignore b/controller/.gitignore
@@ -11,6 +11,7 @@
 system-test-encrypt-key*
 /.nyc_output
 /test/pewpew
+/test/scripting/pewpew
 /test/password.txt
 /pewpew-okta-creds-db
 /pewpew-okta-creds-db-np

diff --git a/controller/acceptance/pewpew.spec.ts b/controller/acceptance/pewpew.spec.ts
@@ -33,7 +33,7 @@ async function fetch (
 // Re-create these here so we don't have to run yamlparser.spec by importing it
 const UNIT_TEST_FOLDER = process.env.UNIT_TEST_FOLDER || "test";
 const PEWPEW_LEGACY_FILEPATH = path.join(UNIT_TEST_FOLDER, "pewpew.zip");
-const PEWPEW_SCRIPTING_FILEPATH = path.join(UNIT_TEST_FOLDER, "pewpew_scripting.zip");
+const PEWPEW_SCRIPTING_FILEPATH = path.join(UNIT_TEST_FOLDER, "scripting/pewpew.zip");
 
 // Beanstalk	<SYSTEM_NAME>_<SERVICE_NAME>_URL
 const integrationUrl = "http://" + (process.env.BUILD_APP_URL || `localhost:${process.env.PORT || "8081"}`);

diff --git a/controller/integration/pewpew.spec.ts b/controller/integration/pewpew.spec.ts
@@ -13,7 +13,7 @@ logger.config.LogFileName = "ppaas-controller";
 
 const UNIT_TEST_FOLDER = process.env.UNIT_TEST_FOLDER || "test";
 const PEWPEW_LEGACY_FILEPATH = path.join(UNIT_TEST_FOLDER, "pewpew.zip");
-const PEWPEW_SCRIPTING_FILEPATH = path.join(UNIT_TEST_FOLDER, "pewpew_scripting.zip");
+const PEWPEW_SCRIPTING_FILEPATH = path.join(UNIT_TEST_FOLDER, "scripting/pewpew.zip");
 
 const authAdmin: AuthPermissions = {
   authPermission: AuthPermission.Admin,

diff --git a/controller/test/pewpew.spec.ts b/controller/test/pewpew.spec.ts
@@ -39,7 +39,7 @@ logger.config.LogFileName = "ppaas-controller";
 
 const UNIT_TEST_FOLDER = process.env.UNIT_TEST_FOLDER || "test";
 const PEWPEW_LEGACY_FILEPATH = path.join(UNIT_TEST_FOLDER, "pewpew.zip");
-const PEWPEW_SCRIPTING_FILEPATH = path.join(UNIT_TEST_FOLDER, "pewpew_scripting.zip");
+const PEWPEW_SCRIPTING_FILEPATH = path.join(UNIT_TEST_FOLDER, "scripting/pewpew.zip");
 
 const authAdmin: AuthPermissions = {
   authPermission: AuthPermission.Admin,

diff --git a/controller/test/pewpew_scripting.zip → controller/test/scripting/pewpew.zip b/controller/test/pewpew_scripting.zip → controller/test/scripting/pewpew.zip