This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 06fb37c538 GH-2344: Use run-script-os to write different test:e2e
commands in jena-fuseki-ui
06fb37c538 is described below
commit 06fb37c5386f33662e6386d0cf9d9b8867541dea
Author: Øyvind Gjesdal <[email protected]>
AuthorDate: Sun May 26 23:56:56 2024 +0200
GH-2344: Use run-script-os to write different test:e2e commands in
jena-fuseki-ui
* Enable failure on tests for jena-fuseki-ui maven pom.
* Have separate versions for *nix and windows of test:e2e using
run-script-os package
* update lockfile
---
jena-fuseki2/jena-fuseki-ui/package.json | 5 ++++-
jena-fuseki2/jena-fuseki-ui/pom.xml | 2 +-
jena-fuseki2/jena-fuseki-ui/yarn.lock | 5 +++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/jena-fuseki2/jena-fuseki-ui/package.json
b/jena-fuseki2/jena-fuseki-ui/package.json
index 39967547c4..40fc6542ce 100644
--- a/jena-fuseki2/jena-fuseki-ui/package.json
+++ b/jena-fuseki2/jena-fuseki-ui/package.json
@@ -11,7 +11,9 @@
"serve": "vite preview",
"build": "vite build",
"test:unit": "vitest run --environment jsdom",
- "test:e2e": "cross-env FUSEKI_PORT=\"${FUSEKI_PORT:=3030}\"
PORT=\"${PORT:=8080}\" concurrently --names 'SERVER,CLIENT,TESTS'
--prefix-colors 'yellow,blue,green' --success 'first' --kill-others 'yarn run
serve:fuseki' 'yarn wait-on http://localhost:${FUSEKI_PORT}/$/ping && yarn run
dev' 'yarn wait-on http-get://localhost:${PORT}/index.html && cypress run $@'",
+ "test:e2e": "run-script-os",
+ "test:e2e:nix": "cross-env FUSEKI_PORT=\"${FUSEKI_PORT:=3030}\"
PORT=\"${PORT:=8080}\" concurrently --names 'SERVER,CLIENT,TESTS'
--prefix-colors 'yellow,blue,green' --success 'first' --kill-others \"yarn run
serve:fuseki\" \"yarn wait-on http://localhost:${FUSEKI_PORT}/$/ping && yarn
run dev\" \"yarn wait-on http-get://localhost:${PORT}/index.html && cypress run
$@\"",
+ "test:e2e:win32" : "SET /a (FUSEKI_PORT=FUSEKI_PORT ^ 3030) & SET /a
(PORT=PORT ^ 8080) & cross-env concurrently --names 'SERVER,CLIENT,TESTS'
--prefix-colors 'yellow,blue,green' --success 'first' --kill-others \"yarn run
serve:fuseki\" \"yarn wait-on http://localhost:${FUSEKI_PORT}/$/ping && yarn
run dev\" \"yarn wait-on http-get://localhost:${PORT}/index.html && cypress run
$@\"",
"lint": "eslint --fix src",
"coverage:unit": "yarn run test:unit --coverage",
"coverage:e2e": "cross-env-shell CYPRESS_COVERAGE=true yarn run test:e2e",
@@ -59,6 +61,7 @@
"json-server": "^0.17.4",
"nanoid": "^5.0.5",
"nodemon": "^3.0.1",
+ "run-script-os": "^1.1.6",
"sass": "^1.69.4",
"sinon": "^18.0.0",
"vite": "^5.0.12",
diff --git a/jena-fuseki2/jena-fuseki-ui/pom.xml
b/jena-fuseki2/jena-fuseki-ui/pom.xml
index b855c4dd2d..8499febe13 100644
--- a/jena-fuseki2/jena-fuseki-ui/pom.xml
+++ b/jena-fuseki2/jena-fuseki-ui/pom.xml
@@ -108,7 +108,7 @@
</goals>
<phase>test</phase>
<configuration>
- <testFailureIgnore>true</testFailureIgnore>
+ <testFailureIgnore>false</testFailureIgnore>
<environmentVariables>
<PORT>${org.apache.jena.fuseki.ui.port}</PORT>
<FUSEKI_PORT>${org.apache.jena.fuseki.port}</FUSEKI_PORT>
diff --git a/jena-fuseki2/jena-fuseki-ui/yarn.lock
b/jena-fuseki2/jena-fuseki-ui/yarn.lock
index 333aa46764..99b39d9ff3 100644
--- a/jena-fuseki2/jena-fuseki-ui/yarn.lock
+++ b/jena-fuseki2/jena-fuseki-ui/yarn.lock
@@ -5037,6 +5037,11 @@ run-parallel@^1.1.9:
dependencies:
queue-microtask "^1.2.2"
+run-script-os@^1.1.6:
+ version "1.1.6"
+ resolved
"https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347";
+ integrity
sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==
+
rxjs@^7.5.1, rxjs@^7.8.1:
version "7.8.1"
resolved
"https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543";
