From 2212cacef2838129d8b303e0554b47020b6a31b7 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 12 Jun 2015 10:43:19 +0200 Subject: [PATCH] Revert "Remove the SCHEME_AND_DOMAIN constant." This reverts commit 8ddb9cfcb6b0b36984bc68ffbe91cebe888f5250. --- tests/wpt/web-platform-tests/websockets/constants.js | 12 +++++++++--- .../websockets/interfaces/WebSocket/events/010.html | 2 +- .../websockets/interfaces/WebSocket/events/011.html | 2 +- .../websockets/interfaces/WebSocket/events/012.html | 2 +- .../websockets/interfaces/WebSocket/events/013.html | 2 +- .../websockets/interfaces/WebSocket/events/014.html | 2 +- .../WebSocket/protocol/protocol-initial.html | 2 +- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tests/wpt/web-platform-tests/websockets/constants.js b/tests/wpt/web-platform-tests/websockets/constants.js index 8312cd253fe..f7d46d2c44e 100644 --- a/tests/wpt/web-platform-tests/websockets/constants.js +++ b/tests/wpt/web-platform-tests/websockets/constants.js @@ -1,12 +1,18 @@ -//This file requires server-side substitutions and must be included as constants.js?pipe=sub +//This file requires server-side substitutions and must be included as constants.js?pipe=config +var DOMAIN_FOR_WS_TESTS = "{{host}}"; +var DOMAIN_FOR_WSS_TESTS = "{{host}}"; var PORT = "{{ports[ws][0]}}"; //FIXME: Add support for wss var PORT_SSL = "{{ports[ws][0]}}"; +// logic for using wss URLs instead of ws +var SCHEME_AND_DOMAIN; var SCHEME_DOMAIN_PORT; if (location.search == '?wss') { - SCHEME_DOMAIN_PORT = 'wss://{{host}}:' + PORT_SSL; + SCHEME_AND_DOMAIN = 'wss://'+DOMAIN_FOR_WSS_TESTS; + SCHEME_DOMAIN_PORT = SCHEME_AND_DOMAIN + ":" + PORT_SSL; } else { - SCHEME_DOMAIN_PORT = 'ws://{{host}}:' + PORT; + SCHEME_AND_DOMAIN = 'ws://'+DOMAIN_FOR_WS_TESTS; + SCHEME_DOMAIN_PORT = SCHEME_AND_DOMAIN + ":" + PORT; } diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html index 61a184a3dca..367c36c7940 100644 --- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html +++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html @@ -8,7 +8,7 @@ var events = ['onclose', 'onopen', 'onerror', 'onmessage']; for (var i = 0; i < events.length; ++i) { test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message'); + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); var foo = function() {} ws[events[i]] = foo; assert_equals(ws[events[i]], foo, events[i]); diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html index 13a506ddbc9..a0043ed6456 100644 --- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html +++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html @@ -8,7 +8,7 @@ var events = ['onclose', 'onopen', 'onerror', 'onmessage']; for (var i = 0; i < events.length; ++i) { test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message'); + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); ws[events[i]] = 1; assert_equals(ws[events[i]], null); }, events[i]); diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html index 54500aa7de5..8a507d37808 100644 --- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html +++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html @@ -8,7 +8,7 @@ var events = ['onclose', 'onopen', 'onerror', 'onmessage']; for (var i = 0; i < events.length; ++i) { test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message'); + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); ws[events[i]] = ";"; assert_equals(ws[events[i]], null); }, events[i]); diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html index e1d93770ad9..719de840a53 100644 --- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html +++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html @@ -8,7 +8,7 @@ var events = ['onclose', 'onopen', 'onerror', 'onmessage']; for (var i = 0; i < events.length; ++i) { test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message'); + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); var obj = {handleEvent:this.unreached_func("handleEvent was called")}; ws[events[i]] = obj; assert_equals(ws[events[i]], obj); diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html index 81c25484cb0..92304a600be 100644 --- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html +++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html @@ -8,7 +8,7 @@ var events = ['onclose', 'onopen', 'onerror', 'onmessage']; for (var i = 0; i < events.length; ++i) { test(function() { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message'); + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); var foo = function() {} ws[events[i]] = foo; assert_equals(ws[events[i]], foo, events[i]); diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html index 4450401f945..f89c1f05815 100644 --- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html +++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html @@ -7,6 +7,6 @@