Skip to content

Commit 32bfcf7

Browse files
marcelduranmarcelduran
authored
Merge pull request #80 from kitak/use-https
Use https instead of http
2 parents 55dff8e + ff7a636 commit 32bfcf7

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎lib/webpagetest.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ function runTest(what, options, callback) {
316316
query[reSpace.test(what) ? 'script' : 'url'] = what;
317317
// set dummy url when scripting, needed when webdriver script
318318
if (query.script) {
319-
query.url = 'http://www.webpagetest.org';
319+
query.url = 'https://www.webpagetest.org';
320320
}
321321
helper.setQuery(mapping.commands.test, options, query);
322322

@@ -733,7 +733,7 @@ function WebPageTest(server, key) {
733733
// Allow global config override
734734
WebPageTest.paths = paths;
735735
WebPageTest.filenames = filenames;
736-
WebPageTest.defaultServer = 'http://www.webpagetest.org';
736+
WebPageTest.defaultServer = 'https://www.webpagetest.org';
737737
WebPageTest.defaultListenPort = 7791;
738738
WebPageTest.defaultWaitResultsPort = 8000;
739739

‎test/command-line-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ describe('WebPageTest Command Line', function() {
126126
exec(mock('test ' + encodeURIComponent(script)), function(err, data) {
127127
if (err) return done(err);
128128
data = JSON.parse(data);
129-
assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&url=http%3A%2F%2Fwww.webpagetest.org&f=json');
129+
assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&url=https%3A%2F%2Fwww.webpagetest.org&f=json');
130130
done();
131131
});
132132
});
@@ -137,7 +137,7 @@ describe('WebPageTest Command Line', function() {
137137
exec(mock('test ' + filename), function(err, data) {
138138
if (err) return done(err);
139139
data = JSON.parse(data);
140-
assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete%0A&url=http%3A%2F%2Fwww.webpagetest.org&f=json');
140+
assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete%0A&url=https%3A%2F%2Fwww.webpagetest.org&f=json');
141141
done();
142142
});
143143
});

‎test/dryrun-test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ describe('Dry Run', function() {
151151

152152
wpt.runTest(script, {dryRun: true}, function (err, data) {
153153
if (err) return done(err);
154-
assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&url=http%3A%2F%2Fwww.webpagetest.org&f=json');
154+
assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&url=https%3A%2F%2Fwww.webpagetest.org&f=json');
155155
done();
156156
});
157157
});

‎test/fixtures/command-line/help.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
-h, --help output usage information
3535
-V, --version output the version number
36-
-s, --server <server> the WPT server URL [http://www.webpagetest.org]
36+
-s, --server <server> the WPT server URL [https://www.webpagetest.org]
3737
-d, --dryrun just return the RESTful API URL
3838
-o, --out <file> place the output into <file>. Defaults to stdout
3939

‎test/helpers/nock-server.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var reqResMap = {
1717
'/getTesters.php': 'testers.xml',
1818
'/runtest.php?url=http%3A%2F%2Ftwitter.com%2Fmarcelduran&f=json': 'runTest.json',
1919
'/runtest.php?url=http%3A%2F%2Ftwitter.com%2Fmarcelduran&location=Local_Firefox_Chrome%3AChrome&runs=3&fvonly=1&label=test%20123&timeline=1&netlog=1&pngss=1&f=json': 'runTest.json',
20-
'/runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&url=http%3A%2F%2Fwww.webpagetest.org&f=json': 'runTest.json',
20+
'/runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&url=https%3A%2F%2Fwww.webpagetest.org&f=json': 'runTest.json',
2121
'/getgzip.php?test=120816_V2_2&file=1_pagespeed.txt': 'pageSpeed.json',
2222
'/export.php?test=120816_V2_2': 'har.json',
2323
'/getgzip.php?test=120816_V2_2&file=1_progress.csv': 'utilization.csv',
@@ -55,7 +55,7 @@ var reqResMap = {
5555
'/testStatus.php?test=120816_V2_3': 'testStatusNotFound.json',
5656
'/jsonResult.php?test=120816_V2_3': 'testResultsNotFound.json',
5757
'/runtest.php?url=&f=json': 'runTestInvalid.json',
58-
'/runtest.php?script=&url=http%3A%2F%2Fwww.webpagetest.org&f=json': 'runTestInvalid.json',
58+
'/runtest.php?script=&url=https%3A%2F%2Fwww.webpagetest.org&f=json': 'runTestInvalid.json',
5959
'/getgzip.php?test=120816_V2_3&file=1_pagespeed.txt': '',
6060
'/export.php?test=120816_V2_3': 'harNotFound.json',
6161
'/waterfall.php?test=120816_V2_3&run=1&cached=0': 'waterfallNotFound.png',
@@ -83,7 +83,7 @@ function WebPageTestMockServer(host) {
8383
return new WebPageTestMockServer(host);
8484
}
8585

86-
server = nock(host || 'http://www.webpagetest.org');
86+
server = nock(host || 'https://www.webpagetest.org');
8787
nock.enableNetConnect();
8888

8989
// request/response mapping

0 commit comments

Comments
 (0)