From 11d165246745c5f99ffc1fd3bbffd911613212de Mon Sep 17 00:00:00 2001
From: shockrah <alejandros714@protonmail.com>
Date: Sat, 1 May 2021 17:13:32 -0700
Subject: [PATCH] * Fixing push/popd path typo * Removing export command from
 cargo-unit-test job This was causing the job to fail so the env vars have
 been moved to live under the ci file's job-level variables key

---
 .gitlab-ci.yml           | 4 +---
 scripts/run-api-tests.sh | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ae9863..f9e99e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,9 +154,7 @@ cargo-test-json-api:
 
   script:
     - cd json-api/
-    - export HMAC_PATH="../hmac.secret" && \
-        export WSS_HMAC_PATH="../wss-hmac.secret" && \
-        cargo test --release
+    - cargo test --release
 
   artifacts:
     paths: 
diff --git a/scripts/run-api-tests.sh b/scripts/run-api-tests.sh
index b6865d2..a0a8e0b 100644
--- a/scripts/run-api-tests.sh
+++ b/scripts/run-api-tests.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
 # First the rtc server
-pushd ../rtc-server/
+pushd ./rtc-server/
 	echo Setting up RTC server
 	npm run autotest&
 	rtc_pid=$!
 popd
 
 # Next the json api
-pushd ../json-api/
+pushd ./json-api/
 	echo Setting up API server
 	cargo run --release -- -H ../hmac.secret -w ../wss-hmac.secret -s&
 	json_pid=$!