Skip to content

Commit fd8b439

Browse files
committed
Add merge conflict example repo archive
1 parent 7ed089a commit fd8b439

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed
File renamed without changes.

ui-tests/docker/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ USER root
66
# Upgrade JupyterLab
77
RUN mamba install -c conda-forge -y git jupyterlab nbdime
88

9-
# ADD --chown=1000:1000 examples /home/jovyan/work/
10-
ADD --chown=1000:1000 merge-repo.tar.xz /home/jovyan/work
9+
# Copy and unarchive merge conflict example repo
10+
# Cannot use symlinks, need another examples folder just for ui-tests
11+
ADD --chown=1000:1000 data/merge-conflict-example.tar.gz /home/jovyan/work
1112

1213
USER 1000
Binary file not shown.

ui-tests/docker/examples

Lines changed: 0 additions & 1 deletion
This file was deleted.

ui-tests/playwright.config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ const config: PlaywrightTestConfig = {
44
timeout: 60 * 1000,
55
use: {
66
// Browser options
7-
// headless: false,
7+
headless: true,
88

99
// Context options
1010
viewport: { width: 1280, height: 720 },
1111

1212
// Artifacts
13-
video: 'on',
14-
},
13+
video: 'on'
14+
}
1515
};
1616

1717
export default config;

0 commit comments

Comments
 (0)