Fix browser tests (#1262)

vmware-tanzu · Oct 30, 2019 · a1a8eee · a1a8eee
1 parent 16830b7
commit a1a8eee
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/integration/jest-puppeteer.config.js b/integration/jest-puppeteer.config.js
@@ -3,7 +3,7 @@ const { headless } = require("./args");
 module.exports = {
   launch: {
     headless,
-    args: ["--no-sandbox"]
+    args: ["--no-sandbox", "--window-size=1200,780"]
   },
   browserContext: "incognito"
 };
diff --git a/integration/jest.environment.js b/integration/jest.environment.js
@@ -49,6 +49,12 @@ class ScreenshotOnFailureEnvironment extends PuppeteerEnvironment {
     await this.generateScreenshotsFolder();
     await this.waitOnService();
     await super.setup();
+    await this.global.page.setViewport({
+      width: 1200,
+      height: 780,
+      deviceScaleFactor: 1
+    });
+    await this.global.page.setDefaultTimeout(8000);
   }
 
   async teardown() {

diff --git a/integration/jest.setup.js b/integration/jest.setup.js
@@ -1,5 +1,7 @@
-require("expect-puppeteer");
 const { endpoint } = require("./args");
+const { setDefaultOptions } = require("expect-puppeteer");
+
+setDefaultOptions({ timeout: 4000 });
 
 // endpoint argument is mandatory
 if (endpoint == null || endpoint == "") {

diff --git a/integration/use-cases/create-registry.js b/integration/use-cases/create-registry.js
@@ -1,7 +1,6 @@
 jest.setTimeout(120000);
 
 test("Deploys an application with the values by default", async () => {
-  page.setDefaultTimeout(4000);
   await page.goto(getUrl("/#/login"));
 
   await expect(page).toFillForm("form", {

diff --git a/integration/use-cases/default-deployment.js b/integration/use-cases/default-deployment.js
@@ -1,7 +1,6 @@
 jest.setTimeout(120000);
 
 test("Deploys an application with the values by default", async () => {
-  page.setDefaultTimeout(4000);
   await page.goto(getUrl("/#/login"));
 
   await expect(page).toFillForm("form", {

diff --git a/integration/use-cases/missing-permissions.js b/integration/use-cases/missing-permissions.js
@@ -1,15 +1,12 @@
 jest.setTimeout(120000);
 
 test("Fails to deploy an application due to missing permissions", async () => {
-  page.setDefaultTimeout(4000);
   await page.goto(getUrl("/#/login"));
 
   await expect(page).toFillForm("form", {
     token: process.env.VIEW_TOKEN
   });
 
-  await page.screenshot({ path: "example.png" });
-
   await expect(page).toClick("button", { text: "Login" });
 
   await expect(page).toClick("a", { text: "Catalog" });

diff --git a/script/e2e-test.sh b/script/e2e-test.sh
@@ -89,9 +89,6 @@ for dep in ${deployments[@]}; do
   echo "Deployment ${dep} ready"
 done
 
-# Wait for DNS to be ready
-k8s_wait_for_deployment kube-system coredns
-
 # Wait for Kubeapps Jobs
 k8s_wait_for_job_completed kubeapps apprepositories.kubeapps.com/repo-name=stable
 echo "Job apprepositories.kubeapps.com/repo-name=stable ready"