More fixes to webmessaging origin comparison.

web-platform-tests · Nov 26, 2014 · f8bc276 · f8bc276
1 parent 17b9847
commit f8bc276
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/webmessaging/event.source.xorigin.sub.htm b/webmessaging/event.source.xorigin.sub.htm
@@ -14,13 +14,14 @@
 
 <script>
 
-    var description = "Test Description: Corss-origin: event.source returns the WindowProxy of the source window.";
+    var description = "Test Description: Cross-origin: event.source returns the WindowProxy of the source window.";
 
     var t = async_test(description);
 
+    var PORT = "{{ports[http][0]}}" !== "80" ? ":{{ports[http][0]}}" : "";
     var DATA = "foo";
     var TARGET = document.querySelector("iframe");
-    var XORIGIN = "http://{{domains[www1]}}:{{ports[http][0]}}";
+    var XORIGIN = "http://{{domains[www1]}}" + PORT;
     var ExpectedResult = [XORIGIN, "AccessCookieDenied"];
     var ActualResult = [];
 

diff --git a/webmessaging/postMessage_asterisk_xorigin.sub.htm b/webmessaging/postMessage_asterisk_xorigin.sub.htm
@@ -20,10 +20,11 @@
 
     var t = async_test(description);
 
+    var PORT = "{{ports[http][0]}}" !== "80" ? ":{{ports[http][0]}}" : "";
     var TARGET1 = document.querySelectorAll("iframe")[0];
     var TARGET2 = document.querySelectorAll("iframe")[1];
-    var XORIGIN = "http://{{domains[www]}}:{{ports[http][0]}}";
-    var SORIGIN = "http://" + location.host;
+    var XORIGIN = "http://{{domains[www]}}" + PORT;
+    var SORIGIN = "http://{{host}}" + PORT;
     var ExpectedResult = ["#1", XORIGIN, "#2", SORIGIN];
     var ActualResult = [];
     var loaded = 0;

diff --git a/webmessaging/postMessage_origin_mismatch_xorigin.sub.htm b/webmessaging/postMessage_origin_mismatch_xorigin.sub.htm
@@ -21,9 +21,10 @@
 
     var t = async_test(description);
 
+    var PORT = "{{ports[http][0]}}" !== "80" ? ":{{ports[http][0]}}" : "";
     var TARGET = document.querySelector("iframe");
-    var XORIGIN = "http://{{domains[www1]}}:{{ports[http][0]}}/";
-    var SORIGIN = "http://" + location.hostname;
+    var XORIGIN = "http://{{domains[www]}}" + PORT;
+    var SORIGIN = "http://{{host}}" + PORT;
     var ExpectedResult = ["#0", XORIGIN, "#3", XORIGIN];
     var ActualResult = [];