Merge pull request #8 from JeremyEastham/master

feat: Add IntelliJ IDEA Run Configurations
supertokens · Apr 22, 2022 · c2ec044 · c2ec044
2 parents 53c9dbc + 2f6c592
commit c2ec044
Show file tree

Hide file tree

Showing 15 changed files with 97 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -97,6 +97,9 @@ LICENSE.md
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
 
+# Other files
+.idea/runConfigurations.xml
+
 # Gradle
 .idea/**/gradle.xml
 .idea/**/libraries

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations/Lint.xml b/.idea/runConfigurations/Lint.xml
diff --git a/.idea/runConfigurations/Load_Modules.xml b/.idea/runConfigurations/Load_Modules.xml
diff --git a/.idea/runConfigurations/Run_All_Tests.xml b/.idea/runConfigurations/Run_All_Tests.xml
diff --git a/.idea/runConfigurations/Start_Testing_Environment.xml b/.idea/runConfigurations/Start_Testing_Environment.xml
diff --git a/startTestingEnv b/startTestingEnv
@@ -31,13 +31,15 @@ fi
 
 if [[ $wait = "true" ]]
 then
+  echo "Test environment started! Leave this script running while running tests."
 	# we wait for user to end the session
 	while [[ true ]]
 	do
-		echo "Running test env"
+		echo "Test environment running..."
 	    sleep 2
 	done
 else
+  echo "Running all tests..."
 	# ../ because the tests are run relative to the project's folder.
 	./gradlew test
 fi
diff --git a/utils/addDevTag b/utils/addDevTag
@@ -1,3 +1,4 @@
+#!/bin/bash
 # check if we need to merge master into this branch------------
 if [[ $(git log origin/master ^HEAD) ]]; then
     echo "You need to merge master into this branch. Exiting"

diff --git a/utils/addReleaseTag b/utils/addReleaseTag
@@ -1,3 +1,4 @@
+#!/bin/bash
 # working directory is inside supertokens-*/. Expects a releasePassword file to be ../
 # ./addReleaseTag [--forced]
 # get version------------

diff --git a/utils/cleanDevEnv b/utils/cleanDevEnv
diff --git a/utils/cleanTestEnvCicd b/utils/cleanTestEnvCicd
@@ -1,3 +1,4 @@
+#!/bin/bash
 rm -rf core
 rm -rf plugin-interface
 rm -rf plugin
@@ -7,4 +8,5 @@ rm version.yaml
 rm -rf temp
 rm install
 rm install.bat
-rm LICENSE.md
+rm LICENSE.md
+rm .testEnvRunning
diff --git a/utils/cleanTestEnvLocal b/utils/cleanTestEnvLocal
@@ -1,3 +1,4 @@
+#!/bin/bash
 rm -rf core
 rm -rf plugin-interface
 rm -rf plugin
@@ -7,4 +8,5 @@ rm version.yaml
 rm -rf temp
 rm install
 rm install.bat
-rm LICENSE.md
+rm LICENSE.md
+rm .testEnvRunning
diff --git a/utils/createConfigFileForTesting b/utils/createConfigFileForTesting
@@ -1,5 +1,5 @@
-
-> config_temp.yaml
+#!/bin/bash
+touch config_temp.yaml
 
 prefix=`./utils/project-prefix`
 

diff --git a/utils/setupTestEnvCicd b/utils/setupTestEnvCicd
@@ -1,8 +1,9 @@
+#!/bin/bash
 # load version and jars
 # setup jars, dependencies and version
 
 ./gradlew clean
-> version_temp.yaml
+touch version_temp.yaml
 
 prefix=`./utils/project-prefix`
 
@@ -155,4 +156,5 @@ mv version_temp.yaml version.yaml
 ./utils/createConfigFileForTesting
 mkdir temp
 cp config.yaml temp/config.yaml
-rm config.yaml
+rm config.yaml
+touch .testEnvRunning
diff --git a/utils/setupTestEnvLocal b/utils/setupTestEnvLocal
@@ -1,7 +1,8 @@
+#!/bin/bash
 # setup jars, dependencies and version
 
 ./gradlew clean
-> version_temp.yaml
+touch version_temp.yaml
 
 prefix=`./utils/project-prefix`
 
@@ -138,4 +139,5 @@ mv version_temp.yaml version.yaml
 ./utils/createConfigFileForTesting
 mkdir temp
 cp config.yaml temp/config.yaml
-rm config.yaml
+rm config.yaml
+touch .testEnvRunning