Skip to content

Commit

Permalink
Add docker stack for e2e tests, remove cypress (#524)
Browse files Browse the repository at this point in the history
* Add docker stack for e2e tests
* Remove cypress
* Split CI into lint and component-tests
* Fix vue proxy settings and remove nginx proxy

---------

Co-authored-by: James Perretta <[email protected]>
Co-authored-by: James Perretta <[email protected]>
  • Loading branch information
3 people authored Nov 18, 2024
1 parent 9323c0a commit daf78c8
Show file tree
Hide file tree
Showing 17 changed files with 120 additions and 330 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
"extends": [
"eslint:recommended",
"plugin:vue/essential",
"plugin:@typescript-eslint/recommended"
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-type-checked"
],
"parserOptions": {
"project": true,
"ecmaVersion": 12,
"parser": "@typescript-eslint/parser",
"sourceType": "module"
Expand Down
34 changes: 27 additions & 7 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ on:
push:
branches: [ develop ]
pull_request:
branches: [ develop ]

jobs:
build:

lint:
runs-on: ubuntu-latest

strategy:
Expand All @@ -21,14 +19,36 @@ jobs:

steps:
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm install

- run: npm ci
- run: npm run lint
- run: npm run build
- run: npm test
- run: npx cypress run --component

component-tests:
# Lint is fast. If we wait for it we guarantee a cache hit on dependencies.
needs: lint

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- run: npm ci
- run: npm run build
- run: npm run test
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "e2e_test_stack/autograder-server"]
path = e2e_test_stack/autograder-server
url = [email protected]:eecs-autograder/autograder-server.git
16 changes: 0 additions & 16 deletions cypress.config.ts

This file was deleted.

5 changes: 0 additions & 5 deletions cypress/fixtures/example.json

This file was deleted.

37 changes: 0 additions & 37 deletions cypress/support/commands.ts

This file was deleted.

12 changes: 0 additions & 12 deletions cypress/support/component-index.html

This file was deleted.

40 changes: 0 additions & 40 deletions cypress/support/component.ts

This file was deleted.

20 changes: 0 additions & 20 deletions cypress/support/e2e.ts

This file was deleted.

149 changes: 0 additions & 149 deletions docker-compose.yml

This file was deleted.

1 change: 1 addition & 0 deletions e2e_test_stack/autograder-server
Submodule autograder-server added at 3a9045
Loading

0 comments on commit daf78c8

Please sign in to comment.