From 6a33e2775f725323f865b5dab24116e03dfc2f70 Mon Sep 17 00:00:00 2001 From: Oliver Blanthorn Date: Sun, 21 Jun 2020 12:42:58 +0100 Subject: [PATCH] Skip :guiset test on OSX --- e2e_tests/e2e.test.ts | 53 +++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/e2e_tests/e2e.test.ts b/e2e_tests/e2e.test.ts index 188a9866..6b210c2e 100644 --- a/e2e_tests/e2e.test.ts +++ b/e2e_tests/e2e.test.ts @@ -114,6 +114,15 @@ describe("webdriver", () => { return [newtab, result] } + // A simple ternany doesn't work inline :( + function testbutskipplatforms(...platforms){ + if (platforms.includes(os.platform)) { + return test.skip + } + return test + } + + test("`:rssexec` works", async () => { const driver = await getDriver() try { @@ -174,30 +183,30 @@ describe("webdriver", () => { } }) - test("`:guiset` works", async () => { - const { driver, newProfiles } = await getDriverAndProfileDirs() - try { - // Then, make sure `:guiset` is offering completions - const iframe = await iframeLoaded(driver) - await sendKeys(driver, ":guiset ") - await driver.switchTo().frame(iframe) - const elements = await driver.findElements(By.className("GuisetCompletionOption")) - expect(elements.length).toBeGreaterThan(0) + testbutskipplatforms("darwin")("`:guiset` works", async () => { + const { driver, newProfiles } = await getDriverAndProfileDirs() + try { + // Then, make sure `:guiset` is offering completions + const iframe = await iframeLoaded(driver) + await sendKeys(driver, ":guiset ") + await driver.switchTo().frame(iframe) + const elements = await driver.findElements(By.className("GuisetCompletionOption")) + expect(elements.length).toBeGreaterThan(0) - // Use whatever the first suggestion is - await sendKeys(driver, " ") - await driver.sleep(2000) - expect(await driver.executeScript(`return document.getElementById("tridactyl-input").value`)) + // Use whatever the first suggestion is + await sendKeys(driver, " ") + await driver.sleep(2000) + expect(await driver.executeScript(`return document.getElementById("tridactyl-input").value`)) .toEqual("userChrome.css written. Please restart Firefox to see the changes.") - expect(newProfiles.find(p => fs - .readdirSync(path.join(p, "chrome")) - .find(files => files.match("userChrome.css$"))) - ).toBeDefined() - } catch (e) { - fail(e) - } finally { - await killDriver(driver) - } + expect(newProfiles.find(p => fs + .readdirSync(path.join(p, "chrome")) + .find(files => files.match("userChrome.css$"))) + ).toBeDefined() + } catch (e) { + fail(e) + } finally { + await killDriver(driver) + } }) test("`:colourscheme` works", async () => {