From 7f4bd40dbf53e1ad4567e4697595bc12085f1499 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Mon, 3 Apr 2023 11:41:43 +0200
Subject: [PATCH] (test) verify env vars before running tests

---
 scripts/tests.sh                              | 26 ++++++++++++++++++-
 .../events/recurrence_update_test.rb          |  2 +-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/scripts/tests.sh b/scripts/tests.sh
index e1130a257..981a635b2 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -5,6 +5,10 @@
 
 stripe_public_key=$(RAILS_ENV='test' bin/rails runner "puts ENV['STRIPE_PUBLISHABLE_KEY']")
 stripe_secret_key=$(RAILS_ENV='test' bin/rails runner "puts ENV['STRIPE_API_KEY']")
+oauth2_client_id=$(RAILS_ENV='test' bin/rails runner "puts ENV['OAUTH_CLIENT_ID']")
+oauth2_client_secret=$(RAILS_ENV='test' bin/rails runner "puts ENV['OAUTH_CLIENT_SECRET']")
+oidc_client_id=$(RAILS_ENV='test' bin/rails runner "puts ENV['OIDC_CLIENT_ID']")
+oidc_client_secret=$(RAILS_ENV='test' bin/rails runner "puts ENV['OIDC_CLIENT_SECRET']")
 if [[ -z "$stripe_public_key" ]]; then
   read -rp "STRIPE_PUBLISHABLE_KEY is not set. Please input the public key now. > " stripe_public_key </dev/tty
   if [[ -z "$stripe_public_key" ]]; then echo "Key was not set, exiting..."; exit 1; fi
@@ -14,5 +18,25 @@ if [[ -z "$stripe_secret_key" ]]; then
   read -rp "STRIPE_API_KEY is not set. Please input the secret key now. > " stripe_secret_key </dev/tty
   if [[ -z "$stripe_secret_key" ]]; then echo "Key was not set, exiting..."; exit 1; fi
 fi
+if [[ -z "$oauth2_client_id" ]]; then
+  read -rp "OAUTH_CLIENT_ID is not set. Please input the client ID now. > " oauth2_client_id </dev/tty
+  if [[ -z "$oauth2_client_id" ]]; then echo "Key was not set, exiting..."; exit 1; fi
+fi
 
-STRIPE_PUBLISHABLE_KEY="$stripe_public_key" STRIPE_API_KEY="$stripe_secret_key" RAILS_ENV='test' bin/rails test "$@"
+if [[ -z "$oauth2_client_secret" ]]; then
+  read -rp "OAUTH_CLIENT_SECRET is not set. Please input the client secret now. > " oauth2_client_secret </dev/tty
+  if [[ -z "$oauth2_client_secret" ]]; then echo "Key was not set, exiting..."; exit 1; fi
+fi
+if [[ -z "$oidc_client_id" ]]; then
+  read -rp "OIDC_CLIENT_ID is not set. Please input the client ID now. > " oidc_client_id </dev/tty
+  if [[ -z "$oidc_client_id" ]]; then echo "Key was not set, exiting..."; exit 1; fi
+fi
+
+if [[ -z "$oidc_client_secret" ]]; then
+  read -rp "OIDC_CLIENT_SECRET is not set. Please input the client secret now. > " oidc_client_secret </dev/tty
+  if [[ -z "$oidc_client_secret" ]]; then echo "Key was not set, exiting..."; exit 1; fi
+fi
+
+STRIPE_PUBLISHABLE_KEY="$stripe_public_key" STRIPE_API_KEY="$stripe_secret_key" \
+OAUTH_CLIENT_ID="$oauth2_client_id" OAUTH_CLIENT_SECRET="$oauth2_client_secret" \
+OIDC_CLIENT_ID="$oidc_client_id" OIDC_CLIENT_SECRET="$oidc_client_secret" RAILS_ENV='test' bin/rails test "$@"
diff --git a/test/integration/events/recurrence_update_test.rb b/test/integration/events/recurrence_update_test.rb
index 66964cba7..80a843968 100644
--- a/test/integration/events/recurrence_update_test.rb
+++ b/test/integration/events/recurrence_update_test.rb
@@ -93,7 +93,7 @@ class Events::RecurrenceUpdateTest < ActionDispatch::IntegrationTest
         db_event.event_image.attachment.file.path
       )
       assert FileUtils.compare_file(
-        File.join(ActionDispatch::IntegrationTest.fixture_path, new_file),
+        File.join(ActionDispatch::IntegrationTest.fixture_path, "files/#{new_file}"),
         db_event.event_files[0].attachment.file.path
       )
     end