Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove the SCHEME_AND_DOMAIN constant.

Browse source 
All its users are connecting to port 80, which is not typically under the
control of the wpt server.
This commit is contained in:
Ms2ger 2015-06-11 20:13:45 +02:00
parent 61a9f9d7d4
commit 8ddb9cfcb6
7 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/wpt/web-platform-tests/websockets/constants.js
View file

@ -1,18 +1,12 @@
//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}}";
//This file requires server-side substitutions and must be included as constants.js?pipe=sub
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_AND_DOMAIN = 'wss://'+DOMAIN_FOR_WSS_TESTS;
SCHEME_DOMAIN_PORT = SCHEME_AND_DOMAIN + ":" + PORT_SSL;
SCHEME_DOMAIN_PORT = 'wss://{{host}}:' + PORT_SSL;
} else {
SCHEME_AND_DOMAIN = 'ws://'+DOMAIN_FOR_WS_TESTS;
SCHEME_DOMAIN_PORT = SCHEME_AND_DOMAIN + ":" + PORT;
SCHEME_DOMAIN_PORT = 'ws://{{host}}:' + PORT;
}

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html
View file

@ -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_AND_DOMAIN+'/');
var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
var foo = function() {}
ws[events[i]] = foo;
assert_equals(ws[events[i]], foo, events[i]);

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html
View file

@ -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_AND_DOMAIN+'/');
var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
ws[events[i]] = 1;
assert_equals(ws[events[i]], null);
}, events[i]);

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html
View file

@ -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_AND_DOMAIN+'/');
var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
ws[events[i]] = ";";
assert_equals(ws[events[i]], null);
}, events[i]);

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html
View file

@ -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_AND_DOMAIN+'/');
var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
var obj = {handleEvent:this.unreached_func("handleEvent was called")};
ws[events[i]] = obj;
assert_equals(ws[events[i]], obj);

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html
View file

@ -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_AND_DOMAIN+'/');
var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
var foo = function() {}
ws[events[i]] = foo;
assert_equals(ws[events[i]], foo, events[i]);

2
tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html
View file

@ -7,6 +7,6 @@
<script>
test(function(t) {
// The protocol attribute must initially return the empty string
assert_equals((new WebSocket(SCHEME_AND_DOMAIN+'/')).protocol, '');
assert_equals((new WebSocket(SCHEME_DOMAIN_PORT + '/empty-message')).protocol, '');
});
</script>