From 2eacf8e99ff4efe94a1dbee41cd8a79f8c2383cb Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Mon, 13 May 2024 15:29:51 +0200
Subject: [PATCH] fix: wip new pipeline
---
flake.nix | 29 +++++------------------------
source/components/form/form.mjs | 2 +-
test/util/jsdom.mjs | 7 +------
3 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/flake.nix b/flake.nix
index 05a8b881f..98cee84ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -116,30 +116,11 @@
nativeBuildInputs = gitlabPackages;
shellHook = ''
- if [ -z "''${CI_JOB_TOKEN}" ]; then
- exit 1
- fi
-
- cd ''${CI_PROJECT_DIR} || exit 1
-
- # ${pkgs'.git}/bin/git config --global user.email "''${GITLAB_USER_EMAIL}"
- # ${pkgs'.git}/bin/git config --global user.name "''${GITLAB_USER_NAME}"
- # ${pkgs'.git}/bin/git config --global credential.helper '!f() { echo "username=gitlab-ci-token"; echo "password=''${CI_JOB_TOKEN}"; }; f'
- # ${pkgs'.git}/bin/git config --global pull.rebase true
- # ${pkgs'.git}/bin/git config --global http.sslVerify "false"
- #
- # ${pkgs'.git}/bin/git remote set-url origin "''${CI_REPOSITORY_URL}"
- #
- # ${pkgs'.git}/bin/git fetch --all --tags --unshallow
- # ${pkgs'.git}/bin/git reset --hard origin/master
- # ${pkgs'.git}/bin/git clean -fd
- # ${pkgs'.git}/bin/git checkout $CI_COMMIT_REF_NAME
- # ${pkgs'.git}/bin/git pull origin $CI_COMMIT_REF_NAME
-
-
-
-
-
+ if [ -z "''${CI_JO B_TOKEN}" ]; then
+ exit 1
+ fi
+
+ cd ''${CI_PROJECT_DIR} || exit 1
'';
};
};
diff --git a/source/components/form/form.mjs b/source/components/form/form.mjs
index f2f25fa6d..9668c1665 100644
--- a/source/components/form/form.mjs
+++ b/source/components/form/form.mjs
@@ -585,7 +585,7 @@ function getTemplate() {
// language=HTML
return `
<div data-monster-role="control" part="control">
- <form data-monster-attributes="disabled path:disabled | if:true, class path:classes.form"
+ <form data-monster-attributes="disabled path:disabled | if:true, class path:classes.form"
data-monster-role="form"
part="form">
<slot data-monster-role="slot"></slot>
diff --git a/test/util/jsdom.mjs b/test/util/jsdom.mjs
index fcd6c5856..1dcfdd707 100644
--- a/test/util/jsdom.mjs
+++ b/test/util/jsdom.mjs
@@ -29,12 +29,7 @@ function initJSDOM(options) {
return import("jsdom").then(({JSDOM}) => {
JSDOMExport = JSDOM;
- const {window} = new JSDOM(`<html>
-<head>
-</head>
-<body>
-<div id="mocks"></div>
-</body>`, options);
+ const {window} = new JSDOM(`<!DOCTYPE html><html lang="en"><head><title>Test</title></head><body><div id="mocks"></div></body></html>`, options);
g['window'] = window;
--
GitLab