extended e2e tests

karchjd · May 15, 2024 · 5e30237 · 5e30237
1 parent 4b5933e
commit 5e30237
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 54 deletions.
diff --git a/dev/compile_restart_dev.R b/dev/compile_restart_dev.R
@@ -1,5 +1,5 @@
 recompile_front <- T # nolint
-release <- TRUE
+release <- T
 
 if (recompile_front) {
   # Compile Svelte front end

diff --git a/dev/start_for_tests.R b/dev/start_for_tests.R
@@ -7,17 +7,6 @@ if (!requireNamespace("pkgload", quietly = TRUE)) {
 }
 
 golem::detach_all_attached()
-
-print("hallo")
-# Document and reload your package
-# roxygen2::roxygenise()
 pkgload::load_all()
-library(lavaan)
-HS.model <- " visual  =~ x1 + x2 + x3
-              textual =~ x4 + x5 + x6
-              speed   =~ x7 + x8 + x9 "
-
-fit <- cfa(HS.model, data = HolzingerSwineford1939)
 options(shiny.port = 3245)
-print("Starting server...")
-start_gui(fit)
+start_gui()
diff --git a/frontend/e2e/cfa.zip → frontend/e2e/cfa.lvd b/frontend/e2e/cfa.zip → frontend/e2e/cfa.lvd
diff --git a/frontend/e2e/example.spec.ts b/frontend/e2e/example.spec.ts
@@ -8,9 +8,20 @@ console.log(__dirname);
 
 //File menu
 
+test.beforeEach(async ({ page }) => {
+  const fileChooserPromise = page.waitForEvent("filechooser");
+  await page.goto("/");
+  await page.getByRole("button", { name: "File" }).click();
+  await page.waitForTimeout(500);
+  await page.getByRole("link", { name: "Load Model and Data", exact: true }).click();
+  const fileChooser = await fileChooserPromise;
+  await fileChooser.setFiles(path.join(__dirname, "cfa.lvd"));
+});
+
+
 test("new model", async ({ page }) => {
-  await page.goto('/');
   await page.getByRole("button", { name: "File" }).click();
+  await page.waitForTimeout(500);
   await page.getByRole("link", { name: "New Model" }).click();
   await page.getByText("OK").click();
   // @ts-expect-error
@@ -21,10 +32,11 @@ test("new model", async ({ page }) => {
   await expect(page.getByTestId("result-text")).toContainText("Command");
 });
 
+
 test("Load Data", async ({ page }) => {
   const fileChooserPromise = page.waitForEvent("filechooser");
-  await page.goto("/");
   await page.getByRole("button", { name: "File" }).click();
+  await page.waitForTimeout(500);
   await page.getByRole("link", { name: "Load Data", exact: true }).click();
 
   const fileChooser = await fileChooserPromise;
@@ -33,60 +45,46 @@ test("Load Data", async ({ page }) => {
   await expect(heading).toBeVisible();
 });
 
-test("Load Model and Data", async ({ page }) => {
-  const fileChooserPromise = page.waitForEvent("filechooser");
-  await page.goto("/");
-  await page.getByRole("button", { name: "File" }).click();
-  await page
-    .getByRole("link", { name: "Load Model and Data", exact: true })
-    .click();
-  await page.getByText("OK").click();
-
-  const fileChooser = await fileChooserPromise;
-  await fileChooser.setFiles(path.join(__dirname, "cfa.zip"));
-});
-
 test("Download Model", async ({ page }) => {
-  await page.goto("/");
   await page.getByRole("button", { name: "File" }).click();
+  await page.waitForTimeout(500);
   const downloadPromise = page.waitForEvent("download");
   await page.getByRole("link", { name: "Download Model", exact: true }).click();
   const download = await downloadPromise;
-  expect(download.suggestedFilename()).toBe("diagram.json");
+  expect(download.suggestedFilename()).toBe("model.lvm");
 });
 
 test("Remove Data", async ({ page }) => {
-  await page.goto("/");
   await page.getByRole("button", { name: "File" }).click();
+  await page.waitForTimeout(500);
   await page.getByRole("link", { name: "Remove Data" }).click();
   const button = await page.getByRole('button', { name: 'Show Data' });
   expect(await button.isDisabled()).toBe(true);
 });
 
 test("Download Model Data", async ({ page }) => {
-  await page.goto("/");
-  await page.waitForTimeout(3000);
   await page.getByRole("button", { name: "File" }).click();
+  await page.waitForTimeout(500);
   const downloadPromise = page.waitForEvent("download");
   await page
     .getByRole("link", { name: "Download Model and Data", exact: true })
     .click();
   const download = await downloadPromise;
-  expect(download.suggestedFilename()).toMatch(/^lavaangui.*\.zip$/);
+  expect(download.suggestedFilename()).toMatch(/^lavaangui.*\.lvd$/);
 });
 
 test("Export PNG", async ({ page }) => {
-  await page.goto("/");
   await page.getByRole("button", { name: "File" }).click();
+  await page.waitForTimeout(500);
   const downloadPromise = page.waitForEvent("download");
   await page.getByRole("link", { name: "PNG", exact: false }).click();
   const download = await downloadPromise;
   expect(download.suggestedFilename()).toBe("model.png");
 });
 
 test("Export JPG", async ({ page }) => {
-  await page.goto("/");
   await page.getByRole("button", { name: "File" }).click();
+  await page.waitForTimeout(500);
   const downloadPromise = page.waitForEvent("download");
   await page.getByRole("link", { name: "JPG", exact: false }).click();
   const download = await downloadPromise;
@@ -95,7 +93,6 @@ test("Export JPG", async ({ page }) => {
 
 //View Menu
 test("Default options View", async ({ page }) => {
-  await page.goto("/");
   await page.getByRole("button", { name: "Estimates" }).click();
   await page.waitForTimeout(1500);
 
@@ -130,8 +127,7 @@ test("Default options View", async ({ page }) => {
 });
 
 test("Show Script", async ({ page }) => {
-  await page.goto("/");
-
+  await page.waitForTimeout(500);
   await expect(page.getByTestId("result-text")).toContainText(
     "library(lavaan)"
   );
@@ -152,9 +148,9 @@ test("Show Script", async ({ page }) => {
 });
 
 test("Show Full Model", async ({ page }) => {
-  await page.goto("/");
-  await page.getByRole("button", { name: "Full Model" }).click();
-
+  await page.waitForTimeout(500);
+  await page.getByRole("button", { name: "Lavaan Model" }).click();
+  await page.waitForTimeout(500);
   await expect(page.getByTestId("result-text")).toContainText("library(lavaan)");
   const lavEdges = await page.evaluate(() =>
     // @ts-expect-error
@@ -173,7 +169,6 @@ test("Show Full Model", async ({ page }) => {
 });
 
 test("Fit Model", async ({ page }) => {
-  await page.goto("/");
   await page.getByRole("button", { name: "Estimates" }).click();
 
   await page.waitForTimeout(2000);
@@ -219,7 +214,6 @@ test("Fit Model", async ({ page }) => {
 // });
 
 test("Remove data", async ({ page }) => {
-  await page.goto("http://127.0.0.1:3245/");
   await page.getByRole("button", { name: "File" }).click();
   await page.getByRole("link", { name: "Remove Data" }).click();
   const fitButton = await page.getByRole("button", { name: "Estimates" });
@@ -228,12 +222,13 @@ test("Remove data", async ({ page }) => {
 
 test("Not Identified", async ({ page }) => {
   const fileChooserPromise = page.waitForEvent("filechooser");
-  await page.goto("http://127.0.0.1:3245/");
   await page.getByRole("button", { name: "File" }).click();
+  await page.waitForTimeout(500);
   await page.getByRole("link", { name: "Load Model", exact: true }).click();
   await page.getByText("OK").click();
+  await page.waitForTimeout(500);
   const fileChooser = await fileChooserPromise;
-  await fileChooser.setFiles(path.join(__dirname, "not_identified.json"));
+  await fileChooser.setFiles(path.join(__dirname, "not_identified.lvm"));
   const fitButton = await page.getByRole("button", { name: "Estimates" });
   fitButton.click();
   await page.waitForTimeout(500);

diff --git a/frontend/e2e/not_identified.json → frontend/e2e/not_identified.lvm b/frontend/e2e/not_identified.json → frontend/e2e/not_identified.lvm
diff --git a/frontend/playwright.config.ts b/frontend/playwright.config.ts
@@ -24,25 +24,45 @@ export default defineConfig({
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
     /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: process.env.shinyapps ? 'http://lavaangui.org/' : 'http://127.0.0.1:3245',
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: "on-first-retry",
   },
 
   /* Configure projects for major browsers */
   projects: [
     {
-      name: "chromium",
-      use: { ...devices["Desktop Chrome"] },
+      name: "chromium local",
+      use: {
+        ...devices["Desktop Chrome"], baseURL: 'http://127.0.0.1:3245'
+      },
     },
 
     {
-      name: "firefox",
-      use: { ...devices["Desktop Firefox"] },
+      name: "firefox local",
+      use: { ...devices["Desktop Firefox"], baseURL: 'http://127.0.0.1:3245' },
     },
     {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
+      name: 'webkit local',
+      use: {
+        ...devices['Desktop Safari'], baseURL: 'http://127.0.0.1:3245'
+      },
+    },
+    {
+      name: "chromium global",
+      use: {
+        ...devices["Desktop Chrome"], baseURL: 'https://lavaangui.org/'
+      },
+    },
+
+    {
+      name: "firefox local",
+      use: { ...devices["Desktop Firefox"], baseURL: 'https://lavaangui.org/' },
+    },
+    {
+      name: 'webkit local',
+      use: {
+        ...devices['Desktop Safari'], baseURL: 'https://lavaangui.org/'
+      },
     },
 
     /* Test against mobile viewports. */

diff --git a/rsconnect/shinyapps.io/solo-fsw/lavaangui.dcf b/rsconnect/shinyapps.io/solo-fsw/lavaangui.dcf
@@ -5,5 +5,5 @@ account: solo-fsw
 server: shinyapps.io
 hostUrl: https://api.shinyapps.io/v1
 appId: 10373658
-bundleId: 8527026
+bundleId: 8620648
 url: https://solo-fsw.shinyapps.io/lavaangui/