Skip to content

Commit

Permalink
Merge pull request #562 from rhinstaller/cockpit-lib-update-cockpit-l…
Browse files Browse the repository at this point in the history
…ib-20241219-025930

Makefile: Update Cockpit lib to 11a740cbca185e4adba9c5abb06fd205
  • Loading branch information
KKoukiou authored Dec 19, 2024
2 parents ea7d609 + f4f696c commit 7320163
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@
/po/LINGUAS
/test/common/
/test/images
/test/static-code
/test/ks*.cfg
4 changes: 2 additions & 2 deletions HACKING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Running eslint
Anaconda Web UI uses `ESLint <https://eslint.org/>`_ to automatically check
JavaScript code style in `.js` and `.jsx` files.

ESLint is executed as part of `test/static-code`, aka. `make codecheck`.
ESLint is executed as part of `test/common/static-code`, aka. `make codecheck`.

For developer convenience, the ESLint can be started explicitly by::

Expand All @@ -59,7 +59,7 @@ Running stylelint
Cockpit uses `Stylelint <https://stylelint.io/>`_ to automatically check CSS code
style in `.css` and `scss` files.

Styleint is executed as part of `test/static-code`, aka. `make codecheck`.
Styleint is executed as part of `test/common/static-code`, aka. `make codecheck`.

For developer convenience, the Stylelint can be started explicitly by::

Expand Down
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,10 @@ EXTRA_DIST = dist src firefox-theme
COCKPIT_REPO_FILES = \
pkg/lib \
test/common \
test/static-code \
$(NULL)

COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
COCKPIT_REPO_COMMIT = 7090fab7372ef7e87e508d207e6468ba76983f9f # 329 + 58 commits
COCKPIT_REPO_COMMIT = 11a740cbca185e4adba9c5abb06fd2055baf3dc7 # 331 + 11 commits

$(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
Expand All @@ -167,8 +166,8 @@ $(COCKPIT_REPO_STAMP): Makefile
git archive $(COCKPIT_REPO_TREE) -- $(COCKPIT_REPO_FILES) | tar x

.PHONY: codecheck
codecheck: test/static-code $(NODE_MODULES_TEST)
test/static-code
codecheck: test/common $(NODE_MODULES_TEST)
test/common/static-code

# checkout Cockpit's bots for standard test VM images and API to launch them
# must be from main, as only that has current and existing images; but testvm.py API is stable
Expand Down
3 changes: 3 additions & 0 deletions test/check-review
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ class TestReview(VirtInstallMachineCase):
r.check_disk_row("vda", "/boot", "vda2", "1.07 GB", True, "xfs", is_encrypted=False)
r.check_disk_row("vda", "/", "vda3, LVM", "15.0 GB", True, "xfs", is_encrypted=True)

# move the mouse away to avoid highlighting any UI element (pixel ref does not expect that)
b.mouse("#app", "mouseenter")

# Pixel test the review step with encrypted disk
b.assert_pixels(
"#app",
Expand Down
6 changes: 6 additions & 0 deletions test/check-storage-encryption
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ class TestStorageEncryption(VirtInstallMachineCase, StorageHelpers):
s.set_encryption_selected(False)
i.check_next_disabled(False)

# move the mouse away to avoid highlighting any UI element (pixel ref does not expect that)
b.mouse("#app", "mouseenter")

b.assert_pixels(
"#app",
"storage-step-encrypt",
Expand All @@ -60,6 +63,9 @@ class TestStorageEncryption(VirtInstallMachineCase, StorageHelpers):
encrypt = True
s.set_encryption_selected(encrypt)

# move the mouse away to avoid highlighting any UI element (pixel ref does not expect that)
b.mouse("#app", "mouseenter")

# Disk Encryption / password screen
b.assert_pixels(
"#app",
Expand Down

0 comments on commit 7320163

Please sign in to comment.