diff --git a/flake.nix b/flake.nix index 05a8b881fc2a33f9b8310aaa25166a5024b6d296..98cee84ed58f6b62ff4641fc83cb329265da2d66 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 f2f25fa6d3509cd605a52fe7525c61877520efc0..9668c166518ff3a62126c9fa7b8b0269768cecb3 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 fcd6c5856401a0d7dc2fcf99fd70128d56192608..1dcfdd707bb238d7344b4d53226519d01c0c6cea 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;