5 files changed, 53 insertions, 12 deletions
diff --git a/tests/auto/core/origins/resources/fetchApi.html b/tests/auto/core/origins/resources/fetchApi.html
new file mode 100644
index 000000000..7b54416fd
--- /dev/null
+++ b/tests/auto/core/origins/resources/fetchApi.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+<body>
+    <script type="text/javascript">
+        const queryString = window.location.search;
+        const urlParams = new URLSearchParams(queryString);
+        const url = urlParams.get('url');
+        const f = fetch(url);
+        if (urlParams.get('printRes') == 'true') {
+            f.then((r) => r.text()).then((p) => console.log(p));
+        }
+    </script>
+</body>
+</html>
diff --git a/tests/auto/core/origins/resources/link.html b/tests/auto/core/origins/resources/link.html
new file mode 100644
index 000000000..297b9b273
--- /dev/null
+++ b/tests/auto/core/origins/resources/link.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Link</title>
+    </head>
+    <body>
+        <a id="link" href="">Link</a>
+        <script>
+            const urlParams = new URLSearchParams(window.location.search);
+            document.getElementById("link").href = urlParams.get('linkLocation');
+        </script>
+    </body>
+</html>
diff --git a/tests/auto/core/origins/resources/mixedSchemes.html b/tests/auto/core/origins/resources/mixedSchemes.html
index 53c8c83ff..3e50c2c3b 100644
--- a/tests/auto/core/origins/resources/mixedSchemes.html
+++ b/tests/auto/core/origins/resources/mixedSchemes.html
@@ -6,23 +6,34 @@
          var result;
          var canary;
 
-         function setIFrameUrl(url) {
+         function setIFrameUrl(frameUrl,imgUrl) {
              result = undefined;
              canary = undefined;
-             document.getElementById("iframe").setAttribute("src", url);
-             // Early fire is OK unless the test is expecting cannotLoad.
-             // If timeout is too short then a false positive is possible.
-             setTimeout(() => { result = result || "cannotLoad"; }, 3000);
+             let img = document.createElement('img');
+             img.onerror = function() {
+                 console.log("TEST:cannotLoad");
+                 console.log("TEST:done");
+             };
+             img.onload = function() {
+                 document.getElementById("iframe").setAttribute("src", frameUrl);
+             };
+             img.src = imgUrl
          }
 
          addEventListener("load", function() {
              document.getElementById("iframe").addEventListener("load", function() {
-                 if (canary && window[0].canary)
-                     result = "canLoadAndAccess";
-                 else
-                     result = "canLoadButNotAccess";
+                 if (canary && window[0].canary) {
+                     console.log("TEST:canLoadAndAccess");
+                     console.log("TEST:done");
+                 } else {
+                     console.log("TEST:canLoadButNotAccess");
+                     console.log("TEST:done");
+                 }
              });
          });
+         window.onerror = function(message, url, line, col, errorObj) {
+             return true;
+         };
         </script>
     </head>
     <body>
diff --git a/tests/auto/core/origins/resources/mixedSchemes_frame.html b/tests/auto/core/origins/resources/mixedSchemes_frame.html
index 40ace2d2f..9499caa1f 100644
--- a/tests/auto/core/origins/resources/mixedSchemes_frame.html
+++ b/tests/auto/core/origins/resources/mixedSchemes_frame.html
@@ -3,9 +3,12 @@
     <head>
         <title>Mixed - Frame</title>
         <script>
-         console.log('Frame Loaded');
-         var canary = true;
-         parent.canary = true;
+         try{
+             var canary = true;
+             parent.canary = true;
+         }catch(exception){
+         };
+
         </script>
     </head>
     <body></body>
diff --git a/tests/auto/core/origins/resources/red.png b/tests/auto/core/origins/resources/red.png
new file mode 100644
index 000000000..5ae85192b
--- /dev/null
+++ b/tests/auto/core/origins/resources/red.png