Merge pull request #154 from Flowpack/bugfix/dev-server

BUGFIX: Make devserver and e2e tests work again

.github/workflows/tests.yml

@@ -11,8 +11,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: '16'
           cache: 'yarn'
@@ -27,15 +27,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.composer/cache
           key: dependencies-composer-${{ hashFiles('composer.json') }}
@@ -60,11 +60,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: '16'
           cache: 'yarn'
-      - uses: actions/checkout@v2
 
       - name: Install dependencies
         run: yarn
@@ -77,3 +77,10 @@ jobs:
 
       - name: Run TestCafe
         run: yarn test:github-actions
+
+      - name: Archive failure screenshots
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: e2e-failure-screenshots
+          path: screenshots

.gitignore

@@ -7,6 +7,8 @@
 # Application & development dependencies.
 #
 node_modules
+.yarn/cache
+.yarn/install-state.gz
 
 #
 # Compiled assets.
@@ -21,3 +23,4 @@ yarn-error.log
 #
 .vscode/
 .idea/
+/screenshots

.testcaferc.json

@@ -1,5 +1,15 @@
 {
-  "browsers": "chromium",
+  "browsers": {
+    "path": "chromium",
+    "cmd": "--window-size=1280,720"
+  },
   "src": ["Resources/Private/JavaScript/media-module/tests/**/*.ts"],
-  "appCommand": "yarn ts-node Resources/Private/JavaScript/dev-server/server.ts"
+  "appCommand": "yarn ts-node --project Resources/Private/JavaScript/dev-server/tsconfig.json Resources/Private/JavaScript/dev-server/src/server.ts",
+  "screenshots": {
+    "takeOnFails": true
+  },
+  "hostname": "localhost",
+  "retryTestPages": true,
+  "pageLoadTimeout": 10000,
+  "pageRequestTimeout": 60000
 }

Resources/Private/JavaScript/dev-server/package.json

@@ -3,13 +3,16 @@
   "version": "1.0.0",
   "license": "GNU GPLv3",
   "dependencies": {
-    "@media-ui/media-module": "*"
+    "@media-ui/media-module": "*",
+    "@media-ui/feature-asset-usage": "*",
+    "@media-ui/feature-concurrent-editing": "*"
   },
   "devDependencies": {
+    "@types/node": "^16.18.3",
     "express": "^4.17.1",
     "nodemon": "^2.0.6"
   },
   "scripts": {
-    "dev": "nodemon --watch '*.ts' server.ts"
+    "dev": "nodemon --watch '*.ts' src/server.ts"
   }
 }