From 9060a045c2bc983c70ade9df5cd1c5159dd9b270 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Sat, 2 Apr 2022 21:15:38 +0200 Subject: [PATCH] DEV: Minor linting fixes (#16359) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. `test/run-qunit.js` wasn't eslinted (I'm not adding it to the CI workflow for now, just fixed the issues) 2. "…" utf character isn't rendered correctly in Jenkins, replaced with three dots 3. Don't try to lint `tmp` when doing `eslint .` in the root dir --- .eslintignore | 1 + lib/tasks/smoke_test.rake | 2 +- test/run-qunit.js | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.eslintignore b/.eslintignore index 3956d17380d..a07eade1d25 100644 --- a/.eslintignore +++ b/.eslintignore @@ -16,3 +16,4 @@ app/assets/javascripts/discourse/tests/test-boot-rails.js app/assets/javascripts/discourse/tests/fixtures node_modules/ dist/ +tmp/ diff --git a/lib/tasks/smoke_test.rake b/lib/tasks/smoke_test.rake index fc19481778a..156e21ff49e 100644 --- a/lib/tasks/smoke_test.rake +++ b/lib/tasks/smoke_test.rake @@ -82,7 +82,7 @@ task "smoke:test" do next if api_key.blank? && api_username.blank? && theme_url.blank? - puts "Running QUnit tests for theme #{theme_url.inspect} using API key #{api_key[0..3]}… and username #{api_username.inspect}" + puts "Running QUnit tests for theme #{theme_url.inspect} using API key #{api_key[0..3]}... and username #{api_username.inspect}" query_params = { seed: Random.new.seed, diff --git a/test/run-qunit.js b/test/run-qunit.js index 94d53054d6d..2b6e72ab98f 100644 --- a/test/run-qunit.js +++ b/test/run-qunit.js @@ -128,7 +128,7 @@ async function runAllTests() { const urlObj = new URL(url); Fetch.requestPaused((data) => { const requestURL = new URL(data.request.url); - if (requestURL.hostname != urlObj.hostname) { + if (requestURL.hostname !== urlObj.hostname) { Fetch.continueRequest({ requestId: data.requestId, }); @@ -207,6 +207,7 @@ runAllTests().catch((e) => { // The following functions are converted to strings // And then sent to chrome to be evaluated function logQUnit() { + const QUnit = window.QUnit; let testErrors = []; let assertionErrors = []; @@ -319,6 +320,7 @@ function logQUnit() { window.qunitDone = context; }); + QUnit.start(); } let qunit_script = logQUnit.toString();