hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

upgrade spectron/webdriver

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2020-11-17 19:21:02 +02:00
parent 1b4bd81acd
commit bddd193096
3 changed files with 740 additions and 641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
integration/__tests__/app.tests.ts
View File

@ -29,9 +29,25 @@ describe("Lens integration tests", () => {
await app.client.waitUntilWindowLoaded() await app.client.waitUntilWindowLoaded()
} }
const click = async (selector: string) => {
return (await app.client.$(selector)).click()
}
const waitForVisible = async (selector: string) => {
return (await app.client.$(selector)).waitForDisplayed()
}
const waitForEnabled = async (selector: string) => {
return (await app.client.$(selector)).waitForEnabled()
}
const waitForExist = async (selector: string) => {
return (await app.client.$(selector)).waitForExist()
}
const clickWhatsNew = async (app: Application) => { const clickWhatsNew = async (app: Application) => {
await app.client.waitUntilTextExists("h1", "What's new?") await app.client.waitUntilTextExists("h1", "What's new?")
await app.client.click("button.primary") await click("button.primary")
await app.client.waitUntilTextExists("h1", "Welcome") await app.client.waitUntilTextExists("h1", "Welcome")
} }
@ -55,14 +71,14 @@ describe("Lens integration tests", () => {
describe("preferences page", () => { describe("preferences page", () => {
it('shows "preferences"', async () => { it('shows "preferences"', async () => {
let appName: string = process.platform === "darwin" ? "Lens" : "File" const appName: string = process.platform === "darwin" ? "Lens" : "File"
await app.electron.ipcRenderer.send('test-menu-item-click', appName, "Preferences") await app.electron.ipcRenderer.send('test-menu-item-click', appName, "Preferences")
await app.client.waitUntilTextExists("h2", "Preferences") await app.client.waitUntilTextExists("h2", "Preferences")
}) })
it('ensures helm repos', async () => { it('ensures helm repos', async () => {
await app.client.waitUntilTextExists("div.repos #message-stable", "stable") // wait for the helm-cli to fetch the stable repo await app.client.waitUntilTextExists("div.repos #message-stable", "stable", 2000) // wait for the helm-cli to fetch the stable repo
await app.client.click("#HelmRepoSelect") // click the repo select to activate the drop-down await click("#HelmRepoSelect") // click the repo select to activate the drop-down
await app.client.waitUntilTextExists("div.Select__option", "") // wait for at least one option to appear (any text) await app.client.waitUntilTextExists("div.Select__option", "") // wait for at least one option to appear (any text)
}) })
}) })
@ -97,21 +113,21 @@ describe("Lens integration tests", () => {
const ready = minikubeReady() const ready = minikubeReady()
const addMinikubeCluster = async (app: Application) => { const addMinikubeCluster = async (app: Application) => {
await app.client.click("div.add-cluster") await click("div.add-cluster")
await app.client.waitUntilTextExists("div", "Select kubeconfig file") await app.client.waitUntilTextExists("div", "Select kubeconfig file")
await app.client.click("div.Select__control") // show the context drop-down list await click("div.Select__control") // show the context drop-down list
await app.client.waitUntilTextExists("div", "minikube") await app.client.waitUntilTextExists("div", "minikube")
if (!await app.client.$("button.primary").isEnabled()) { if (!(await app.client.$("button.primary")).isEnabled()) {
await app.client.click("div.minikube") // select minikube context await click("div.minikube") // select minikube context
} // else the only context, which must be 'minikube', is automatically selected } // else the only context, which must be 'minikube', is automatically selected
await app.client.click("div.Select__control") // hide the context drop-down list (it might be obscuring the Add cluster(s) button) await click("div.Select__control") // hide the context drop-down list (it might be obscuring the Add cluster(s) button)
await app.client.click("button.primary") // add minikube cluster await click("button.primary") // add minikube cluster
} }
const waitForMinikubeDashboard = async (app: Application) => { const waitForMinikubeDashboard = async (app: Application) => {
await app.client.waitUntilTextExists("pre.kube-auth-out", "Authentication proxy started") await app.client.waitUntilTextExists("pre.kube-auth-out", "Authentication proxy started")
await app.client.waitForExist(`iframe[name="minikube"]`) await (await app.client.$(`iframe[name="minikube"]`)).waitForExist()
await app.client.frame("minikube") await app.client.switchToFrame("minikube")
await app.client.waitUntilTextExists("span.link-text", "Cluster") await app.client.waitUntilTextExists("span.link-text", "Cluster")
} }
@ -122,7 +138,7 @@ describe("Lens integration tests", () => {
await clickWhatsNew(app) await clickWhatsNew(app)
await addMinikubeCluster(app) await addMinikubeCluster(app)
await waitForMinikubeDashboard(app) await waitForMinikubeDashboard(app)
await app.client.click('a[href="/nodes"]') await click('a[href="/nodes"]')
await app.client.waitUntilTextExists("div.TableCell", "Ready") await app.client.waitUntilTextExists("div.TableCell", "Ready")
} }
@ -395,14 +411,14 @@ describe("Lens integration tests", () => {
if (drawer !== "") { if (drawer !== "") {
it(`shows ${drawer} drawer`, async () => { it(`shows ${drawer} drawer`, async () => {
expect(clusterAdded).toBe(true) expect(clusterAdded).toBe(true)
await app.client.click(`.sidebar-nav [data-test-id="${drawerId}"] span.link-text`) await click(`.sidebar-nav [data-test-id="${drawerId}"] span.link-text`)
await app.client.waitUntilTextExists(`a[href^="/${pages[0].href}"]`, pages[0].name) await app.client.waitUntilTextExists(`a[href^="/${pages[0].href}"]`, pages[0].name)
}) })
} }
pages.forEach(({ name, href, expectedSelector, expectedText }) => { pages.forEach(({ name, href, expectedSelector, expectedText }) => {
it(`shows ${drawer}->${name} page`, async () => { it(`shows ${drawer}->${name} page`, async () => {
expect(clusterAdded).toBe(true) expect(clusterAdded).toBe(true)
await app.client.click(`a[href^="/${href}"]`) await click(`a[href^="/${href}"]`)
await app.client.waitUntilTextExists(expectedSelector, expectedText) await app.client.waitUntilTextExists(expectedSelector, expectedText)
}) })
}) })
@ -410,7 +426,7 @@ describe("Lens integration tests", () => {
// hide the drawer // hide the drawer
it(`hides ${drawer} drawer`, async () => { it(`hides ${drawer} drawer`, async () => {
expect(clusterAdded).toBe(true) expect(clusterAdded).toBe(true)
await app.client.click(`.sidebar-nav [data-test-id="${drawerId}"] span.link-text`) await click(`.sidebar-nav [data-test-id="${drawerId}"] span.link-text`)
await expect(app.client.waitUntilTextExists(`a[href^="/${pages[0].href}"]`, pages[0].name, 100)).rejects.toThrow() await expect(app.client.waitUntilTextExists(`a[href^="/${pages[0].href}"]`, pages[0].name, 100)).rejects.toThrow()
}) })
} }
@ -429,25 +445,25 @@ describe("Lens integration tests", () => {
it(`shows a logs for a pod`, async () => { it(`shows a logs for a pod`, async () => {
expect(clusterAdded).toBe(true) expect(clusterAdded).toBe(true)
// Go to Pods page // Go to Pods page
await app.client.click(".sidebar-nav [data-test-id='workloads'] span.link-text") await click(".sidebar-nav [data-test-id='workloads'] span.link-text")
await app.client.waitUntilTextExists('a[href^="/pods"]', "Pods") await app.client.waitUntilTextExists('a[href^="/pods"]', "Pods")
await app.client.click('a[href^="/pods"]') await click('a[href^="/pods"]')
await app.client.waitUntilTextExists("div.TableCell", "kube-apiserver") await app.client.waitUntilTextExists("div.TableCell", "kube-apiserver")
// Open logs tab in dock // Open logs tab in dock
await app.client.click(".list .TableRow:first-child") await click(".list .TableRow:first-child")
await app.client.waitForVisible(".Drawer") await waitForVisible(".Drawer")
await app.client.click(".drawer-title .Menu li:nth-child(2)") await click(".drawer-title .Menu li:nth-child(2)")
// Check if controls are available // Check if controls are available
await app.client.waitForVisible(".PodLogs .VirtualList") await waitForVisible(".PodLogs .VirtualList")
await app.client.waitForVisible(".PodLogControls") await waitForVisible(".PodLogControls")
await app.client.waitForVisible(".PodLogControls .SearchInput") await waitForVisible(".PodLogControls .SearchInput")
await app.client.waitForVisible(".PodLogControls .SearchInput input") await waitForVisible(".PodLogControls .SearchInput input")
// Search for semicolon // Search for semicolon
await app.client.keys(":") await app.client.keys(":")
await app.client.waitForVisible(".PodLogs .list span.active") await waitForVisible(".PodLogs .list span.active")
// Click through controls // Click through controls
await app.client.click(".PodLogControls .timestamps-icon") await click(".PodLogControls .timestamps-icon")
await app.client.click(".PodLogControls .undo-icon") await click(".PodLogControls .undo-icon")
}) })
}) })
@ -462,32 +478,32 @@ describe("Lens integration tests", () => {
it('shows default namespace', async () => { it('shows default namespace', async () => {
expect(clusterAdded).toBe(true) expect(clusterAdded).toBe(true)
await app.client.click('a[href="/namespaces"]') await click('a[href="/namespaces"]')
await app.client.waitUntilTextExists("div.TableCell", "default") await app.client.waitUntilTextExists("div.TableCell", "default")
await app.client.waitUntilTextExists("div.TableCell", "kube-system") await app.client.waitUntilTextExists("div.TableCell", "kube-system")
}) })
it(`creates ${TEST_NAMESPACE} namespace`, async () => { it(`creates ${TEST_NAMESPACE} namespace`, async () => {
expect(clusterAdded).toBe(true) expect(clusterAdded).toBe(true)
await app.client.click('a[href="/namespaces"]') await click('a[href="/namespaces"]')
await app.client.waitUntilTextExists("div.TableCell", "default") await app.client.waitUntilTextExists("div.TableCell", "default")
await app.client.waitUntilTextExists("div.TableCell", "kube-system") await app.client.waitUntilTextExists("div.TableCell", "kube-system")
await app.client.click("button.add-button") await click("button.add-button")
await app.client.waitUntilTextExists("div.AddNamespaceDialog", "Create Namespace") await app.client.waitUntilTextExists("div.AddNamespaceDialog", "Create Namespace")
await app.client.keys(`${TEST_NAMESPACE}\n`) await app.client.keys(`${TEST_NAMESPACE}\n`)
await app.client.waitForExist(`.name=${TEST_NAMESPACE}`) await waitForExist(`.name=${TEST_NAMESPACE}`)
}) })
it(`creates a pod in ${TEST_NAMESPACE} namespace`, async () => { it(`creates a pod in ${TEST_NAMESPACE} namespace`, async () => {
expect(clusterAdded).toBe(true) expect(clusterAdded).toBe(true)
await app.client.click(".sidebar-nav [data-test-id='workloads'] span.link-text") await click(".sidebar-nav [data-test-id='workloads'] span.link-text")
await app.client.waitUntilTextExists('a[href^="/pods"]', "Pods") await app.client.waitUntilTextExists('a[href^="/pods"]', "Pods")
await app.client.click('a[href^="/pods"]') await click('a[href^="/pods"]')
await app.client.waitUntilTextExists("div.TableCell", "kube-apiserver") await app.client.waitUntilTextExists("div.TableCell", "kube-apiserver")
await app.client.click('.Icon.new-dock-tab') await click('.Icon.new-dock-tab')
await app.client.waitUntilTextExists("li.MenuItem.create-resource-tab", "Create resource") await app.client.waitUntilTextExists("li.MenuItem.create-resource-tab", "Create resource")
await app.client.click("li.MenuItem.create-resource-tab") await click("li.MenuItem.create-resource-tab")
await app.client.waitForVisible(".CreateResource div.ace_content") await waitForVisible(".CreateResource div.ace_content")
// Write pod manifest to editor // Write pod manifest to editor
await app.client.keys("apiVersion: v1\n") await app.client.keys("apiVersion: v1\n")
await app.client.keys("kind: Pod\n") await app.client.keys("kind: Pod\n")
@ -499,12 +515,12 @@ describe("Lens integration tests", () => {
await app.client.keys("- name: nginx-create-pod-test\n") await app.client.keys("- name: nginx-create-pod-test\n")
await app.client.keys(" image: nginx:alpine\n") await app.client.keys(" image: nginx:alpine\n")
// Create deployment // Create deployment
await app.client.waitForEnabled("button.Button=Create & Close") await waitForEnabled("button.Button=Create & Close")
await app.client.click("button.Button=Create & Close") await click("button.Button=Create & Close")
// Wait until first bits of pod appears on dashboard // Wait until first bits of pod appears on dashboard
await app.client.waitForExist(".name=nginx-create-pod-test") await waitForExist(".name=nginx-create-pod-test")
// Open pod details // Open pod details
await app.client.click(".name=nginx-create-pod-test") await click(".name=nginx-create-pod-test")
await app.client.waitUntilTextExists("div.drawer-title-text", "Pod: nginx-create-pod-test") await app.client.waitUntilTextExists("div.drawer-title-text", "Pod: nginx-create-pod-test")
}) })
}) })

7
package.json
View File

@ -316,7 +316,6 @@
"@types/terser-webpack-plugin": "^3.0.0", "@types/terser-webpack-plugin": "^3.0.0",
"@types/universal-analytics": "^0.4.4", "@types/universal-analytics": "^0.4.4",
"@types/uuid": "^8.0.0", "@types/uuid": "^8.0.0",
"@types/webdriverio": "^4.13.0",
"@types/webpack": "^4.41.17", "@types/webpack": "^4.41.17",
"@types/webpack-dev-server": "^3.11.1", "@types/webpack-dev-server": "^3.11.1",
"@types/webpack-env": "^1.15.2", "@types/webpack-env": "^1.15.2",
@ -371,7 +370,7 @@
"react-window": "^1.8.5", "react-window": "^1.8.5",
"sass-loader": "^8.0.2", "sass-loader": "^8.0.2",
"sharp": "^0.26.1", "sharp": "^0.26.1",
"spectron": "11.0.0", "spectron": "^11.0.0",
"style-loader": "^1.2.1", "style-loader": "^1.2.1",
"terser-webpack-plugin": "^3.0.3", "terser-webpack-plugin": "^3.0.3",
"ts-jest": "^26.1.0", "ts-jest": "^26.1.0",
@ -387,8 +386,12 @@
"webpack-cli": "^3.3.11", "webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.11.0", "webpack-dev-server": "^3.11.0",
"webpack-node-externals": "^1.7.2", "webpack-node-externals": "^1.7.2",
"webdriverio": "6.1.2",
"what-input": "^5.2.10", "what-input": "^5.2.10",
"xterm": "^4.6.0", "xterm": "^4.6.0",
"xterm-addon-fit": "^0.4.0" "xterm-addon-fit": "^0.4.0"
},
"resolutions": {
"got": "<=11.5.1"
} }
} }

1276
yarn.lock
View File

File diff suppressed because it is too large Load Diff