Skip to content

Commit 8d433c2

Browse files
author
Ryan Reilly
authored
Merge branch 'master' into 132-of-gource
2 parents 2c7378d + 4856448 commit 8d433c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3707
-845
lines changed

.github/workflows/playwright.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Run all Playwright Tests
2+
on:
3+
push:
4+
branches: [ master ]
5+
pull_request:
6+
branches: [ master ]
7+
jobs:
8+
test:
9+
timeout-minutes: 5
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v3
13+
- uses: actions/setup-node@v3
14+
with:
15+
node-version: 18
16+
- name: Install dependencies
17+
run: npm ci
18+
- name: Install Playwright Browsers
19+
run: npx playwright install --with-deps
20+
- name: Run Playwright tests
21+
run: npx playwright test

.github/workflows/runTests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run all tests
1+
name: Run all AEG tests
22

33
on:
44
pull_request:
@@ -16,4 +16,4 @@ jobs:
1616
run: npm ci
1717

1818
- name: Run all vitest tests
19-
run: npm run test
19+
run: npx vitest

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ build
44
peircemyheart-*
55
docs
66
public/docs
7-
electron-build
7+
electron-build
8+
test-results/
9+
playwright-report/
10+
playwright/.cache/

.vscode/settings.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"Anusha",
44
"atomnode",
55
"buttonface",
6+
"Deiterate",
67
"Deiteration",
78
"hasmousedown",
89
"Huda",
@@ -25,6 +26,19 @@
2526
"vite",
2627
"vitetest",
2728
"wicg",
29+
"vitest",
30+
"xshift",
31+
"yshift",
32+
"ICSI",
33+
"RAIR",
34+
"npmignore",
35+
"viewports",
36+
"msedge",
37+
"singlefile",
38+
"aegtest",
39+
"uitest"
40+
"subbar",
41+
"buttonface",
2842
"Wireframe",
2943
"Gource",
3044
"nbprojekt",

README.md

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ We also use it to invoke all core development tools via `npm run`.
3535
2. [**Vite**](https://vitejs.dev/) : Vite is an asset bundler and build system for large web projects with
3636
many types of resources such as typescript. Additionally, it provides excellent debugging features.
3737
We use it as a build system for Typescript, Asset Compressor, and Live Debugger.
38+
* **Playwright** : a testing framework compatible with Vite with support for TypeScript.
3839
* **Vitest** : a testing framework native to Vite with support for TypeScript. It allows for github workflow compatibility and running numerous tests with one command.
39-
40+
4041
3. [**gts**](https://github.com/google/gts) : gts (Google TypeScript Style) is a set of style guidelines and tools for typescript
4142
consistent and readable formatting. It provides defaults for the following tools we use:
4243
* **eslint** : an extensible linter for javascript and typescript code. It catches
@@ -100,22 +101,32 @@ will be jumped to in VSC.
100101

101102
## Testing
102103

103-
Test your changes! Vitest will help here by looking for all .test.ts files in /tests/ and running them.
104+
Test your frontend changes! Playwright will open a UI on a bunch of different browsers and
105+
walk you through the test scripts you write, step by step. Run the following to get started:
106+
```bash
107+
npm run uitest
108+
```
109+
Optionally, if you would like to run your frontend tests headless, or without any UI, run the following:
110+
```bash
111+
npm run uitestHeadless
112+
```
113+
Also, test your "backend" changes! Vitest will help here by looking for all .test.ts files in /tests/AEGTree and running them.
104114
To perform this locally in a terminal, run the following:
105115
```bash
106-
npm run test
116+
npm run aegtest
107117
```
108118

109-
110119
### Root Files and Folders Overview
111120
```
112121
/.github/ : The code for github workflows this project uses, used for automatically deploying.
113122
114-
/src/ : source code for the application.
123+
/.vscode/ : .json files necessary to use VSCode as a development environment
115124
116125
/public/ : non-code based resources for the application, icons, images, etc.
117126
118-
/tests/ : testing source .test.ts files, made with vitest.
127+
/src/ : source code for the application.
128+
129+
/tests/ : testing source .test.ts files made with vitest and .spec.ts files made with Playwright.
119130
120131
/.eslintignore : list of .js and .ts files the linter shouldn't look at
121132
@@ -129,9 +140,11 @@ npm run test
129140
130141
/LICENSE : The legal jargon for who can use and sell the project.
131142
143+
/package-lock.json : NPM record of all dependencies and sub-dependencies used for this project.
144+
132145
/package.json : main NPM file, contains information about the project and development dependencies.
133146
134-
/package-lock.json : NPM record of all dependencies and sub-dependencies used for this project.
147+
/playwright.config.js : Playwright configuration
135148
136149
/README.md : the information file you're reading right now.
137150

0 commit comments

Comments
 (0)