fix(address-finder): Update to version 4.5.3

* migrate cypress to version 13 * remove outdated code parts * adjust test files
ideal-postcodes · Apr 9, 2024 · 02c803c · 02c803c
1 parent 7b24c7a
commit 02c803c
Show file tree

Hide file tree

Showing 12 changed files with 368 additions and 228 deletions.
diff --git a/cypress.config.js b/cypress.config.js
@@ -0,0 +1,16 @@
+import { defineConfig } from "cypress";
+
+export default defineConfig({
+  e2e: {
+    baseUrl: "http://localhost:8000",
+    video: false,
+    testIsolation: false,
+    specPattern: "cypress/integration/**/**.ts",
+  },
+  viewportWidth: 1920,
+  viewportHeight: 1024,
+  env: {
+    "WC_VERSION": "80",
+    "API_KEY": "ak_marcin"
+  }
+});
diff --git a/cypress.json b/cypress.json
diff --git a/cypress/integration/001_test_setup.ts b/cypress/integration/001_test_setup.ts
@@ -5,6 +5,7 @@ Cypress.on("uncaught:exception", (err, runnable) => {
 
 describe("IdealPostcodes Admin Setup", () => {
   before(() => {
+    console.log(Cypress.env("WC_VERSION"));
     if (Cypress.env("WC_VERSION")) {
       // @ts-ignore
       return cy[`installwc${Cypress.env("WC_VERSION")}`]();

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -47,20 +47,22 @@ declare namespace Cypress {
     installwc59(): void;
     installwc60(): void;
     installwc70(): void;
+    installwc80(): void
   }
 }
 
 Cypress.Commands.add("login", () => {
   cy.visit("/wp-login.php");
-  cy.wait(100);
-  cy.get("#user_login").clear();
-  cy.wait(10);
-  cy.get("#user_login").focus().type("admin");
-  cy.get("#user_pass").clear();
-  cy.wait(100);
-  cy.get("#user_pass").focus().type("password");
-  cy.get("#wp-submit").click();
-  cy.wait(1000);
+  cy.wait(500);
+  cy.get("#user_login").clear().then(() => {
+    cy.wait(10);
+    cy.get("#user_login").focus().type("admin");
+    cy.get("#user_pass").clear();
+    cy.wait(100);
+    cy.get("#user_pass").focus().type("password");
+    cy.get("#wp-submit").click();
+    cy.wait(1000);
+  });
 });
 
 const install42 = () => {
@@ -381,6 +383,7 @@ Cypress.Commands.add("installwc80", () => {
   cy.wait(1000);
   cy.get(".components-button.woocommerce-profiler-navigation-skip-link.is-link").click();
   cy.url({ timeout: 300000 }).should('contain', '/wp-admin/admin.php?page=wc-admin');
+  cy.wait(20000);
   cy.contains("Add shipping costs").click();
   cy.url({ timeout: 300000 }).should('contain', '/wp-admin/admin.php?page=wc-admin&task=shipping');
   cy.get("#woocommerce-shipping-rate__toggle-0").click();

diff --git a/cypress/support/index.ts → cypress/support/e2e.ts b/cypress/support/index.ts → cypress/support/e2e.ts
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
@@ -1,12 +1,8 @@
 {
   "compilerOptions": {
-    "strict": true,
-    "baseUrl": "../node_modules",
-    "target": "es5",
+    "target": "es2015",
     "lib": ["es5", "dom"],
     "types": ["cypress"]
   },
-  "include": [
-    "**/*.ts"
-  ]
+  "include": ["**/*.ts"]
 }
diff --git a/lib/admin.ts b/lib/admin.ts
@@ -1,5 +1,4 @@
 import { AddressFinder } from "@ideal-postcodes/address-finder";
-import { toIso, change, hasValue, isSelect, AnyAddress } from "@ideal-postcodes/jsutil";
 
 const { watch } = AddressFinder;
 
@@ -60,20 +59,7 @@ orderSelectors.forEach((selectors) => {
       outputFields: selectors,
       listStyle: {
         minWidth: "25em"
-      },
-      onAddressRetrieved: function (address: AnyAddress) {
-        const select = document.querySelector(
-          selectors.country
-        ) as HTMLSelectElement;
-        const code = toIso(address);
-        if (
-          select !== null &&
-          code !== null &&
-          isSelect(select) &&
-          hasValue(select, code)
-        )
-          change({ e: select, value: code });
-      },
+      }
     },
     {
       pageTest: (): boolean => /\/wp-admin/i.test(window.location.href),
@@ -88,19 +74,6 @@ userSelectors.forEach((selectors) => {
       ...config,
       ...(config.autocompleteOverride || {}),
       outputFields: selectors,
-      onAddressRetrieved: function (address: AnyAddress) {
-        const select = document.querySelector(
-          selectors.country
-        ) as HTMLSelectElement;
-        const code = toIso(address);
-        if (
-          select !== null &&
-          code !== null &&
-          isSelect(select) &&
-          hasValue(select, code)
-        )
-          change({ e: select, value: code });
-      },
     },
     {
       pageTest: (): boolean => /\/wp-admin/i.test(window.location.href),

diff --git a/lib/extension.ts b/lib/extension.ts
@@ -4,19 +4,19 @@ import {
   Selectors,
   Config,
   idGen,
-  isString,
+  //isString,
   OutputFields,
-  toIso,
+  //toIso,
   hide,
   show,
-  toHtmlElem,
-  isInput,
-  update,
+  //toHtmlElem,
+  //isInput,
+  //update,
   setupBind,
   insertBefore,
   Targets,
   getParent,
-  AnyAddress
+  //AnyAddress
 } from "@ideal-postcodes/jsutil";
 
 if (!window.IdealPostcodes) window.IdealPostcodes = {};
@@ -178,8 +178,6 @@ export const toOutputFields = (
   selectors: Selectors
 ): OutputFields => {
   const outputFields: OutputFields = { ...selectors };
-  if (config.populateOrganisation === false)
-    delete outputFields.organisation_name;
   if (config.populateCounty === false) delete outputFields.county;
   return outputFields;
 };
@@ -213,14 +211,7 @@ export const newBind = (selectors: Selectors) => (config: WooConfig) => {
       apiKey: config.apiKey,
       tags,
       outputFields,
-      onAddressPopulated: (address: AnyAddress) => {
-        if (isString(outputFields.country)) {
-          const countryField = toHtmlElem(parent, outputFields.country);
-          if (isInput(countryField)) {
-            const iso = toIso(address);
-            if (iso) update(countryField, iso);
-          }
-        }
+      onAddressPopulated: () => {
         updateCheckout();
       },
     };