chore(test): negative test case for trustedDomains

krakenjs · Jun 12, 2023 · c226a35 · c226a35
1 parent 0af4698
commit c226a35
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/child/props.js b/src/child/props.js
@@ -87,10 +87,16 @@ export function normalizeChildProps<P, X>(
         ? prop.trustedDomains.includes(getDomain(window))
         : origin === getDomain(window) || isSameDomain(parentComponentWindow);
 
+    // let trustedDomains override sameDomain prop
     if (prop && prop.sameDomain && !trustedChild) {
       continue;
     }
 
+    // sameDomain was not set and trusted domains must match
+    if (prop && prop.trustedDomains && !trustedChild) {
+      continue;
+    }
+
     // $FlowFixMe
     const value = normalizeChildProp(propsDef, props, key, props[key], helpers);
 

diff --git a/src/parent/parent.js b/src/parent/parent.js
@@ -383,10 +383,16 @@ export function parentComponent<P, X, C>({
           ? prop.trustedDomains.includes(initialChildDomain)
           : matchDomain(initialChildDomain, getDomain(window));
 
+      // let trustedDomains override sameDomain prop
       if (prop && prop.sameDomain && !trustedChild) {
         continue;
       }
 
+      // sameDomain was not set and trusted domains must match
+      if (prop && prop.trustedDomains && !trustedChild) {
+        continue;
+      }
+
       result[key] = props[key];
     }
 

diff --git a/test/tests/domain.js b/test/tests/domain.js
@@ -68,7 +68,7 @@ describe("parent domain check", () => {
       return component().render(getBody());
     });
 
-    it("allowedParentDomains is specified as a regex and parent domian match", () => {
+    it("allowedParentDomains is specified as a regex and parent domain match", () => {
       window.__component__ = () => {
         return zoid.create({
           tag: "test-parent-domain-regex",
@@ -163,7 +163,7 @@ describe("parent domain check", () => {
       });
     });
 
-    it("xprops.getParentDomain should pass the correct domain", () => {
+    it("xprops.getParent should pass the correct domain", () => {
       return wrapPromise(({ expect }) => {
         window.__component__ = () => {
           return zoid.create({

diff --git a/test/tests/props.js b/test/tests/props.js
@@ -802,7 +802,7 @@ describe("zoid props cases", () => {
           props: {
             foo: {
               type: "string",
-              trustedDomains: ["mock://venmo.com"],
+              trustedDomains: ["mock://www.child.com"],
             },
           },
         });
@@ -817,7 +817,6 @@ describe("zoid props cases", () => {
           }
         }),
         run: () => `
-                    window.location = "mock://venmo.com";
                     window.xprops.passProp(window.xprops.foo);
                 `,
       });
@@ -850,7 +849,6 @@ describe("zoid props cases", () => {
           }
         }),
         run: () => `
-                    window.location = "mock://venmo.com";
                     window.xprops.passProp(window.xprops.foo);
                 `,
       });