Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUGFIX: Make devserver and e2e tests work again #154

Merged
merged 15 commits into from
Nov 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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') }}
Expand All @@ -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
Expand All @@ -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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
# Application & development dependencies.
#
node_modules
.yarn/cache
.yarn/install-state.gz

#
# Compiled assets.
Expand All @@ -21,3 +23,4 @@ yarn-error.log
#
.vscode/
.idea/
/screenshots
14 changes: 12 additions & 2 deletions .testcaferc.json
Original file line number Diff line number Diff line change
@@ -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
}
7 changes: 5 additions & 2 deletions Resources/Private/JavaScript/dev-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
220 changes: 0 additions & 220 deletions Resources/Private/JavaScript/dev-server/server.ts

This file was deleted.

Loading