diff --git a/tests/_common.ts b/tests/_common.ts index 4869abb2..42656f22 100644 --- a/tests/_common.ts +++ b/tests/_common.ts @@ -109,7 +109,7 @@ function retryTest(f: testFunction): testFunction { result = await f(s, server, driver); } catch (e) { failures += 1; - failureLog += `\n\n===== ${s} attempt ${failures} =====\n` + failureLog += `\n\n===== ${s} attempt ${failures} =====\n`; failureLog += e.stack.toString(); failureLog += e.toString(); failureLog += `\n== VimrcAfter ==:\n${readVimrc()}\n`; @@ -470,7 +470,7 @@ const focusNextPrevTest = async (testTitle: string, server: any, driver: webdriv await driver.wait(async () => "" !== (await driver.switchTo().activeElement().getAttribute("id")), WAIT_DELAY, "focus_prev did not change focused element"); expect(await driver.switchTo().activeElement().getAttribute("id")).toBe("before"); await server.pullCoverageData(frameSocket); -} +}; export const testFocusNextPrev1 = retryTest(withLocalPage("focusnext.html", focusNextPrevTest)); export const testFocusNextPrev2 = retryTest(withLocalPage("focusnext2.html", focusNextPrevTest)); @@ -506,7 +506,7 @@ ${backup}`); await driver.wait(async () => (await input.getAttribute("value")) !== "", WAIT_DELAY, "Input value did not change"); const value = await input.getAttribute("value"); expect(value).toBe("Eval Works!"); - await sendKeys(driver, `:call firenvim#eval_js("(()=>{throw new Error()})()", "OnResult")`.split("").concat([webdriver.Key.ENTER])) + await sendKeys(driver, `:call firenvim#eval_js("(()=>{throw new Error()})()", "OnResult")`.split("").concat([webdriver.Key.ENTER])); await driver.wait(async () => (await input.getAttribute("value")) !== value, WAIT_DELAY, "Input value did not change the second time"); expect(await input.getAttribute("value")).toBe("{}"); await server.pullCoverageData(frameSocket); @@ -530,7 +530,7 @@ export const testPressKeys = retryTest(withLocalPage("chat.html", async (testTit await sendKeys(driver, ":call firenvim#press_keys('')".split("") .concat(webdriver.Key.ENTER)); await driver.wait(async () => ((await input.getAttribute("value")) !== value), WAIT_DELAY, "Input value did not change"); - expect(await input.getAttribute("value")).toBe(" pressed! pressed!b pressed!Space pressed!") + expect(await input.getAttribute("value")).toBe(" pressed! pressed!b pressed!Space pressed!"); await server.pullCoverageData(frameSocket); })); @@ -886,7 +886,7 @@ ${vimrcContent}`); await sendKeys(driver, ":%s/b>/i>/g".split("") .concat(webdriver.Key.ENTER) .concat(":wq".split("")) - .concat(webdriver.Key.ENTER)) + .concat(webdriver.Key.ENTER)); await driver.wait(Until.stalenessOf(span), WAIT_DELAY, "Firenvim span did not disappear"); await driver.wait(async () => (await input.getAttribute("innerHTML") !== innerHTML), WAIT_DELAY, "Input value did not change"); expect(await input.getAttribute("innerText")).toBe(innerText); @@ -919,7 +919,7 @@ ${vimrcContent}`); const [input, span] = await createFirenvimFor(server, driver, By.id("content-input")); const innerText = await input.getAttribute("innerText"); const innerHTML = await input.getAttribute("innerHTML"); - await sendKeys(driver, ":wq".split("").concat(webdriver.Key.ENTER)) + await sendKeys(driver, ":wq".split("").concat(webdriver.Key.ENTER)); await driver.wait(Until.stalenessOf(span), WAIT_DELAY, "Firenvim span did not disappear"); await driver.wait(async () => (await input.getAttribute("innerHTML") !== innerHTML), WAIT_DELAY, "Input value did not change"); expect(await input.getAttribute("innerText")).toBe(innerText); diff --git a/tests/_vimrc.ts b/tests/_vimrc.ts index 19467239..5e7a9a76 100644 --- a/tests/_vimrc.ts +++ b/tests/_vimrc.ts @@ -2,7 +2,6 @@ const fs = require("fs"); const os = require("os"); const path = require("path"); const process = require("process"); -const spawn = require("child_process").spawn; let init_vim: string; @@ -11,7 +10,6 @@ export function setupVimrc() { process.env.XDG_CONFIG_HOME = path.join(base_dir, "config"); process.env.XDG_DATA_HOME = path.join(base_dir, "data"); const nvim_conf_dir = path.join(process.env.XDG_CONFIG_HOME, "nvim"); - const nvim_data_dir = path.join(process.env.XDG_DATA_HOME, "nvim"); try { fs.mkdirSync(nvim_conf_dir, { recursive: true }); fs.mkdirSync(nvim_conf_dir, { recursive: true }); diff --git a/tests/chrome.ts b/tests/chrome.ts index 2ef7f729..e6c426fd 100644 --- a/tests/chrome.ts +++ b/tests/chrome.ts @@ -59,7 +59,6 @@ import * as coverageServer from "./_coverageserver"; describe("Chrome", () => { - let nonHeadlessTest = () => env["HEADLESS"] ? test.skip : test; let driver: any = undefined; let server: any = coverageServer; let background: any = undefined; diff --git a/tests/firefox.ts b/tests/firefox.ts index 982888fc..ffc59d9f 100644 --- a/tests/firefox.ts +++ b/tests/firefox.ts @@ -78,7 +78,7 @@ describe("Firefox", () => { try { fs.rmdirSync(coverage_dir, { recursive: true }); } catch (e) {} - fs.mkdirSync(coverage_dir, { recursive: true }) + fs.mkdirSync(coverage_dir, { recursive: true }); await coverageServer.start(12345, coverage_dir); const backgroundPromise = coverageServer.getNextBackgroundConnection();