Merge branch 'master' of https://github.com/dannyYassine/docker-octane-vue

Author: dannyYassine

.github/workflows/api-tests.yaml

@@ -15,7 +15,7 @@ jobs:
  with:
  working-directory: ./api
  - name: Build containers
- run: docker-compose -f "./../docker-compose-ci.yml" build postgres api
+ run: docker-compose -f "./../docker-compose-ci.yml" build --parallel postgres api
  - name: Run database
  run: docker-compose -f "./../docker-compose-ci.yml" up --detach postgres
  - name: Setup env file

.github/workflows/playwright-test.yaml

@@ -15,15 +15,13 @@ jobs:
  with:
  working-directory: ./client
  - name: Build containers
- run: docker-compose -f "./../docker-compose-ci.yml" build
- # - name: Install client node_modules
- # run: docker-compose run client yarn
- # - name: Install api composer
- # run: docker-compose run api composer install --no-cache --ignore-platform-reqs
+ run: docker-compose -f "./../docker-compose-ci.yml" build --parallel
  - name: Install playwright dependencies
  run: docker-compose run playwright yarn
  - name: Up environment
  run: docker-compose -f "./../docker-compose-ci.yml" up --detach api client postgres
+ - name: Wait
+ run: sleep 5
  - name: Run tests
  run: docker-compose run playwright npx playwright test
  - name: Stop containers

.gitpod.yml

@@ -9,9 +9,9 @@ ports:
  - port: 3306
  onOpen: ignore
  - port: 8000
- onOpen: open-browser
+ onOpen: ignore
  - port: 3000
- onOpen: open-browser
+ onOpen: ignore
 
 vscode:
  extensions:

client/.gitignore

@@ -22,3 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+playwright/playwright-report

client/playwright-report/index.html

@@ -6,6 +6,8 @@ import { defineConfig, devices } from '@playwright/test';
  */
 // require('dotenv').config();
 
+process.env.PW_CLIENT_URL = 'http://client:3000'
+
 /**
  * See https://playwright.dev/docs/test-configuration.
  */
@@ -18,7 +20,7 @@ export default defineConfig({
  * Maximum time expect() should wait for the condition to be met.
  * For example in `await expect(locator).toHaveText();`
  */
- timeout: 5000
+ timeout: process.env.CI ? 30000 : 5000
  },
  /* Run tests in files in parallel */
  fullyParallel: true,
@@ -29,7 +31,7 @@ export default defineConfig({
  /* Opt out of parallel tests on CI. */
  workers: process.env.CI ? 1 : 1,
  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
- reporter: 'html',
+ reporter: [['html', {open: 'never'}]],
  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
  use: {
  /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */

client/playwright.config.ts

@@ -1,7 +1,7 @@
 import { test, expect } from '@playwright/test';
 
 test('loads the app', async ({ page }) => {
- await page.goto('http://localhost:3000');
+ await page.goto(process.env.PW_CLIENT_URL);
 
- await expect(page).toHaveURL(/localhost:3000/);
+ await expect(page).toHaveURL(process.env.PW_CLIENT_URL);
 });

client/playwright/tests/local.spec.ts

@@ -23,4 +23,4 @@ RUN docker-php-ext-enable xdebug
 
 COPY ./api .
 
-RUN composer install --no-dev --no-cache --ignore-platform-reqs
+RUN composer install --no-cache --ignore-platform-reqs