Skip to content

Commit 9ea7747

Browse files
joepiojoepio
committed
Add image to test
1 parent 5917285 commit 9ea7747

File tree

5 files changed

+1
-196
lines changed

5 files changed

+1
-196
lines changed

‎.github/workflows/main.yml‎

Lines changed: 0 additions & 192 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# on: [workflow_dispatch]
21
on: [push, workflow_dispatch]
32

43
name: "Build, test, clippy"
@@ -30,194 +29,3 @@ jobs:
3029
git checkout -b "$branch" || true
3130
- name: Earthly pipeline
3231
run: earthly --org ontola --ci --sat henk -P +pipeline --tag=${{ github.sha }}
33-
- name: Upload test artifacts
34-
uses: actions/upload-artifact@v3
35-
if: failure()
36-
with:
37-
name: test-results
38-
path: ./artifact/test-results/
39-
40-
# - name: Clippy
41-
# run: earthly +clippy
42-
# - name: Build
43-
# run: earthly +build-server
44-
# - name: E2E
45-
# run: earthly -P +e2e
46-
# - name: Push docker image
47-
# run: earthly +docker --tag="latest"
48-
49-
# fmt:
50-
# name: Rustfmt
51-
# runs-on: ubuntu-latest
52-
# steps:
53-
# - run: |
54-
# sudo apt-get update
55-
# sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
56-
# - uses: actions/checkout@v2
57-
# - uses: actions-rs/toolchain@v1
58-
# with:
59-
# profile: minimal
60-
# toolchain: stable
61-
# override: true
62-
# components: rustfmt
63-
# - name: Rust Cache
64-
# uses: Swatinem/rust-cache@v2
65-
# - uses: actions-rs/cargo@v1
66-
# with:
67-
# command: fmt
68-
# args: --all -- --check
69-
70-
# build_js:
71-
# name: Build JS assets
72-
# runs-on: ubuntu-latest
73-
# steps:
74-
# - uses: actions/checkout@v2
75-
76-
# - uses: pnpm/action-setup@v2.0.1
77-
# name: Install pnpm
78-
# id: pnpm-install
79-
# with:
80-
# version: 8
81-
# run_install: false
82-
83-
# - name: Get pnpm store directory
84-
# id: pnpm-cache
85-
# run: |
86-
# echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
87-
88-
# - uses: actions/cache@v3
89-
# name: Setup pnpm cache
90-
# with:
91-
# path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
92-
# key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
93-
# restore-keys: |
94-
# ${{ runner.os }}-pnpm-store-
95-
96-
# - name: Install JS deps
97-
# working-directory: ./browser/
98-
# run: |
99-
# pnpm install
100-
# pnpm run playwright-install
101-
102-
# - name: Lint JS
103-
# working-directory: ./browser/
104-
# run: |
105-
# pnpm run lint
106-
107-
# - name: Build JS
108-
# working-directory: ./browser/
109-
# run: |
110-
# pnpm run build
111-
112-
# - name: Test JS (no e2e)
113-
# working-directory: ./browser/
114-
# run: |
115-
# pnpm run test
116-
117-
# - name: Save JS Build Artifacts
118-
# uses: actions/upload-artifact@v3
119-
# with:
120-
# name: build-artifact
121-
# path: ./browser/data-browser/dist
122-
# e2e:
123-
# name: End-to-end tests
124-
# runs-on: ubuntu-latest
125-
# needs: [build_js]
126-
# steps:
127-
# - run: |
128-
# sudo apt-get update
129-
# sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
130-
# - uses: actions/checkout@v3
131-
# - name: Download JS Build Artifact
132-
# uses: actions/download-artifact@v3
133-
# with:
134-
# name: build-artifact
135-
# path: ./browser/data-browser/dist
136-
137-
# - uses: actions-rs/toolchain@v1
138-
# with:
139-
# profile: minimal
140-
# toolchain: stable
141-
# override: true
142-
# components: clippy
143-
144-
# - name: Rust Cache
145-
# uses: Swatinem/rust-cache@v2
146-
# with:
147-
# cache-on-failure: true
148-
# cache-all-crates: true
149-
150-
# - uses: actions-rs/cargo@v1
151-
# name: cargo build
152-
# with:
153-
# command: build
154-
# args: --locked
155-
156-
# - uses: actions-rs/cargo@v1
157-
# name: cargo clippy
158-
# with:
159-
# command: clippy
160-
# args: --no-deps
161-
162-
# - uses: taiki-e/install-action@nextest
163-
# - uses: actions-rs/cargo@v1
164-
# name: cargo nextest run
165-
# with:
166-
# command: nextest
167-
# args: run --all-features --retries 3
168-
169-
# - uses: pnpm/action-setup@v2.0.1
170-
# name: Install pnpm
171-
# id: pnpm-install
172-
# with:
173-
# version: 8
174-
# run_install: false
175-
176-
# - name: Get pnpm store directory
177-
# id: pnpm-cache
178-
# run: |
179-
# echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
180-
181-
# - uses: actions/cache@v3
182-
# name: Setup pnpm cache
183-
# with:
184-
# path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
185-
# key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
186-
# restore-keys: |
187-
# ${{ runner.os }}-pnpm-store-
188-
189-
# - name: Install Playwright
190-
# working-directory: ./browser/
191-
# run: |
192-
# pnpm install
193-
# pnpm run playwright-install
194-
195-
# - name: Run atomic-server in the background
196-
# run: nohup ./target/debug/atomic-server --initialize &
197-
198-
# - name: Run end-to-end tests
199-
# working-directory: ./browser/
200-
# env:
201-
# FRONTEND_URL: http://localhost:9883
202-
# LANGUAGE: "en_GB"
203-
# DELETE_PREVIOUS_TEST_DRIVES: "false"
204-
# run: pnpm run test-e2e
205-
206-
# # Coverage
207-
# - name: Install cargo-llvm-cov
208-
# uses: taiki-e/install-action@cargo-llvm-cov
209-
# - name: Generate code coverage
210-
# run: cargo llvm-cov --all-features --workspace --lcov --locked --output-path lcov.info
211-
# - name: Upload coverage to Codecov
212-
# uses: codecov/codecov-action@v1
213-
# with:
214-
# token: ${{ secrets.CODECOV_TOKEN }}
215-
# files: lcov.info
216-
# fail_ci_if_error: true
217-
218-
# - name: Upload test artifacts
219-
# uses: actions/upload-artifact@v3
220-
# if: failure()
221-
# with:
222-
# name: test-results
223-
# path: ./browser/data-browser/test-results/

‎browser/e2e/tests/e2e.spec.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,9 +490,8 @@ test.describe('data-browser', async () => {
490490
await fillInput('shortname', page);
491491
await fillInput('description', page);
492492
await page.click('[data-test="save"]');
493-
await page.waitForNavigation();
494493
await page.locator('text=Resource Saved');
495-
await page.goBack();
494+
await contextMenuClick('edit', page);
496495

497496
await page
498497
.locator('[title="Add an item to the recommends list"]')
@@ -579,7 +578,6 @@ test.describe('data-browser', async () => {
579578
await page.click('text=Make current version');
580579

581580
await expect(page.locator('text=Resource version updated')).toBeVisible();
582-
// await page.waitForNavigation();
583581
await expect(page.locator('h1:has-text("First Title")')).toBeVisible();
584582
await expect(page.locator('text=History of First Title')).not.toBeVisible();
585583
});

browser/e2e/tests/e2e.spec.ts-snapshots/data-browser-upload-download-1-chromium-darwin.png renamed to browser/e2e/tests/e2e.spec.ts-snapshots/data-browser-upload-download-1-chromium-darwin copy.png

File renamed without changes.

‎browser/e2e/tests/e2e.spec.ts-snapshots/data-browser-upload-download-1-chromium-linux.png‎

6.75 KB
Loading

‎browser/e2e/tests/test-utils.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ export async function newDrive(page: Page) {
9898
await page.locator(sideBarDriveSwitcher).click();
9999
await page.locator('button:has-text("New Drive")').click();
100100
expect(page.locator(`${currentDriveTitle} > localhost`)).not.toBeVisible();
101-
// await page.waitForNavigation();
102101
await expect(page.locator('text="Create new resource"')).toBeVisible();
103102
const driveURL = await getCurrentSubject(page);
104103
expect(driveURL).toContain('localhost');

0 commit comments

Comments
 (0)