test if services are available

Signed-off-by: Swikriti Tripathi <[email protected]>
nextcloud · Sep 1, 2023 · efe66c0 · efe66c0
1 parent fb1c427
commit efe66c0
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 43 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -105,16 +105,16 @@ jobs:
           sudo update-ca-certificates
           ls ./apps/integration_openproject/ci/data/ssl
           cd apps/integration_openproject/ci
-          docker compose up nextcloud proxy openproject -d
+          docker compose up nextcloud proxy openproject start_dependencies -d
 
-      - name: wait on OpenProject
-        uses: iFaxity/wait-on-action@v1
-        with:
-          resource: http-get://host.docker.internal:3000/api/v3/
-          timeout: 240000
+#      - name: wait on OpenProject
+#        uses: iFaxity/wait-on-action@v1
+#        with:
+#          resource: http-get://host.docker.internal:3000/api/v3/
+#          timeout: 240000
 
       - name: wait on Nextcloud
-        run: until curl -s -f http://nextcloud/status.php | grep '"installed":true'; do echo .; sleep 10; done
+        run: until curl -s -f http://nextcloud.local/status.php | grep '"installed":true'; do echo .; sleep 10; done
 
       - name: try Nextcloud 1
         run: curl http://nextcloud.local/status.php -v

diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
@@ -96,12 +96,12 @@ services:
       - ./data/ssl/:/usr/local/share/ca-certificates
 #    command: ["sh", "-c", "sudo update-ca-certificates && exec ./docker/prod/supervisord"]
 
-#  start_dependencies:
-#    image: dadarek/wait-for-dependencies
-#    depends_on:
-#      - proxy
-#      - openproject
-#    command: proxy:443 proxy:80 openproject:3000
+  start_dependencies:
+    image: dadarek/wait-for-dependencies
+    depends_on:
+      - proxy
+      - openproject
+    command: proxy:443 proxy:80 openproject:80
 
 volumes:
   data:

diff --git a/tests/e2e/cucumber.config.js → cucumber.config.js b/tests/e2e/cucumber.config.js → cucumber.config.js
@@ -1,46 +1,44 @@
-const { Before, BeforeAll, AfterAll, After, setDefaultTimeout } = require("@cucumber/cucumber")
-const { chromium } = require("playwright")
-const {config} = require("./config")
+const { Before, BeforeAll, AfterAll, After, setDefaultTimeout } = require('@cucumber/cucumber')
+const { chromium } = require('playwright')
+const { config } = require('./config')
 const apiHelper = require('./helpers/apiHelper')
-const { OpenprojectAdminPage } = require("./pageObjects/OpenprojectAdminPage")
-const opAdminPageObject = new OpenprojectAdminPage()
+const { OpenprojectAdminPage } = require('./pageObjects/OpenprojectAdminPage')
 
 setDefaultTimeout(120000)
 
-BeforeAll(async function () {
-	await apiHelper.createAdmin()
+BeforeAll(async function() {
+	// await apiHelper.createAdmin()
 	global.browserNC = await chromium.launch({
-		headless: true,
-	});
+		headless: false,
+	})
 	global.browserOP = await chromium.launch({
-		headless: true,
-	});
-});
+		headless: false,
+	})
+})
 
-AfterAll(async function () {
+AfterAll(async function() {
 	await global.browserNC.close()
 	await global.browserOP.close()
-});
+})
 
-Before(async function () {
+Before(async function() {
 	global.contextNC = await global.browserNC.newContext()
-	await contextNC.grantPermissions(['clipboard-read','clipboard-write']);
-	await contextNC.tracing.start({ screenshots: true, snapshots: true });
+	await contextNC.grantPermissions(['clipboard-read', 'clipboard-write'])
+	await contextNC.tracing.start({ screenshots: true, snapshots: true })
 	global.pageNC = await global.contextNC.newPage()
 	global.contextOP = await global.browserOP.newContext()
-	await contextOP.grantPermissions(['clipboard-read','clipboard-write']);
-	await contextOP.tracing.start({ screenshots: true, snapshots: true });
+	await contextOP.grantPermissions(['clipboard-read', 'clipboard-write'])
+	await contextOP.tracing.start({ screenshots: true, snapshots: true })
 	global.pageOP = await global.contextOP.newPage()
-});
+})
 
-After(async function () {
+After(async function() {
 	await apiHelper.resetNextcloudOauthSettings()
-	// await opAdminPageObject.deleteFileStorage()
-	await global.pageNC.close();
-	await contextNC.tracing.stop({ path: 'tests/e2e/report/traceNC.zip' });
-	await global.contextNC.close();
-	await global.pageOP.close();
-	await contextOP.tracing.stop({ path: 'tests/e2e/report/traceOP.zip' });
-	await global.contextOP.close();
-
-});
+	await apiHelper.deleteStorage()
+	await global.pageNC.close()
+	await contextNC.tracing.stop({ path: 'tests/e2e/report/traceNC.zip' })
+	await global.contextNC.close()
+	await global.pageOP.close()
+	await contextOP.tracing.stop({ path: 'tests/e2e/report/traceOP.zip' })
+	await global.contextOP.close()
+})