From 4eaabe8bc3732d34aa07cf059d5cb2f41cc70b9f Mon Sep 17 00:00:00 2001
From: JOASSART Edwin <edwin@blck.coffee>
Date: Tue, 7 May 2024 11:44:21 +0200
Subject: [PATCH] tests

---
 .github/actions/test/action.yml | 7 ++++---
 wdio.conf.ts                    | 9 +++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
index fef746c431e..810b3acf4ac 100644
--- a/.github/actions/test/action.yml
+++ b/.github/actions/test/action.yml
@@ -70,6 +70,8 @@ runs:
         npm run package
         
         # tests requires the app to already be built
+
+        # # only run e2e tests on Mac as it's the only supported platform atm
         if [[ '${{ runner.os }}' == 'macOS' ]]; then
           # run all tests on macOS including E2E
           # E2E tests can't input the administrative password, therefore the tests need to run as root
@@ -79,9 +81,8 @@ runs:
             ETCHER_INCLUDE_VIRTUAL_DRIVES=1 \
             TEST_SOURCE_FILE: $(pwd)/${{ env.TEST_SOURCE_FILE }} \
             TEST_SOURCE_URL: ${{ env.TEST_SOURCE_URL }} \
-            npm run wdio
-        else 
-          # only run unit tests on Linux and Windows as E2E tests are not supported yet
+            npm run wdio:ci
+        else
           npm run wdio:unit
         fi
         
diff --git a/wdio.conf.ts b/wdio.conf.ts
index 70c6565100d..0fcd9cf5f25 100644
--- a/wdio.conf.ts
+++ b/wdio.conf.ts
@@ -55,6 +55,15 @@ export const config: Options.Testrunner = {
 				'./tests/e2e/e2e-flash-from-url.spec.ts',
 			]
 		],
+		// CI needs to runs e2e tests and other tests sequencially
+		'ci': [
+			[
+				'./tests/e2e/e2e-flash-from-file.spec.ts',
+				'./tests/e2e/e2e-flash-from-url.spec.ts',
+				'./tests/gui/**/*.spec.ts',
+				'./tests/shared/**/*.spec.ts',
+			],
+		]
 	},
 	//
 	// ============