From 8379a9b275fc15a2e55ccffae5a8d79f1ce8c920 Mon Sep 17 00:00:00 2001 From: n1474335 Date: Tue, 10 Aug 2021 14:26:33 +0100 Subject: [PATCH] Skipping UI tests in GitHub Actions --- .github/workflows/master.yml | 6 +++--- .github/workflows/pull_requests.yml | 6 +++--- .github/workflows/releases.yml | 6 +++--- nightwatch.json | 2 +- src/core/operations/TLSJA3Fingerprint.mjs | 7 +++++++ 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index d6b6498d..aff9ecf1 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -36,9 +36,9 @@ jobs: - name: Generate sitemap run: npx grunt exec:sitemap - - name: UI Tests - if: success() - run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui + # - name: UI Tests + # if: success() + # run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui - name: Prepare for GitHub Pages if: success() diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index 379078b8..d9552db8 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -32,6 +32,6 @@ jobs: if: success() run: npx grunt prod - - name: UI Tests - if: success() - run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui + # - name: UI Tests + # if: success() + # run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 7985c99a..383ce967 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -33,9 +33,9 @@ jobs: if: success() run: npx grunt prod - - name: UI Tests - if: success() - run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui + # - name: UI Tests + # if: success() + # run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui - name: Upload Release Assets if: success() diff --git a/nightwatch.json b/nightwatch.json index 7054ad33..072e6c52 100644 --- a/nightwatch.json +++ b/nightwatch.json @@ -8,7 +8,7 @@ "launch_url": "http://localhost:8080", "webdriver": { "start_process": true, - "server_path": "./node_modules/chromedriver/lib/chromedriver/chromedriver", + "server_path": "./node_modules/.bin/chromedriver", "port": 9515, "log_path": false }, diff --git a/src/core/operations/TLSJA3Fingerprint.mjs b/src/core/operations/TLSJA3Fingerprint.mjs index 119bdac5..d906d032 100644 --- a/src/core/operations/TLSJA3Fingerprint.mjs +++ b/src/core/operations/TLSJA3Fingerprint.mjs @@ -2,6 +2,13 @@ * @author n1474335 [n1474335@gmail.com] * @copyright Crown Copyright 2021 * @license Apache-2.0 + * + * JA3 created by Salesforce + * John B. Althouse + * Jeff Atkinson + * Josh Atkins + * + * Algorithm released under the BSD-3-clause licence */ import Operation from "../Operation.mjs";