test: fix e2e test

reearth · Jun 1, 2021 · b3e5128 · b3e5128
1 parent 3bcd2d4
commit b3e5128
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/cypress/plugins/index.ts b/cypress/plugins/index.ts
@@ -19,7 +19,19 @@ import dotenvPlugin from "cypress-dotenv";
 const pluginConfig: Cypress.PluginConfig = (on, config) => {
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config
-  config = dotenvPlugin(config, {}, true);
+  config = dotenvPlugin(
+    config,
+    {
+      path: ".env.local",
+    },
+    true,
+  );
+  config.env = {
+    ...config.env,
+    ...Object.fromEntries(
+      Object.entries(process.env).filter(([k]) => k.startsWith("REEARTH_WEB_")),
+    ),
+  };
   config.ignoreTestFiles = ["**/examples/**/*", "types.ts"];
 
   on("task", {

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -123,7 +123,8 @@ Cypress.Commands.add("waitForGraphQL", () =>
 
 Cypress.Commands.add("cesiumViewer", () => cy.window().then(w => w.REEARTH_E2E_CESIUM_VIEWER));
 
-function oauthDomain(u: string): string {
+function oauthDomain(u: string | undefined): string {
+  if (!u) return u;
   if (!u.startsWith("https://") && !u.startsWith("http://")) {
     u = "https://" + u;
   }