Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: catchpoint/WebPageTest.api-nodejs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9c4d4d89aa9637319bdc4d170211e19abafafda7
Choose a base ref
...
head repository: catchpoint/WebPageTest.api-nodejs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 292da745d7f0db7f27d0dae638ab91e902ccbe16
Choose a head ref
23 contributors
Loading
Showing with 3,040 additions and 1,709 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 .travis.yml
  3. +1 −1 Dockerfile
  4. +2 −2 LICENSE
  5. +16 −6 NOTICE
  6. +522 −340 README.md
  7. BIN assets/images/recipe-banner.png
  8. +3 −3 bin/webpagetest
  9. +25 −5 lib/helper.js
  10. +1,284 −644 lib/mapping.js
  11. +3 −3 lib/server.js
  12. +51 −20 lib/specs.js
  13. +464 −283 lib/webpagetest.js
  14. +17 −15 package.json
  15. +4 −4 test/command-line-test.js
  16. +2 −2 test/dryrun-test.js
  17. +2 −2 test/edge-cases-test.js
  18. +4 −7 test/fixtures/command-line/help-batch.txt
  19. +6 −8 test/fixtures/command-line/help-cancel.txt
  20. +7 −9 test/fixtures/command-line/help-chrometrace.txt
  21. +7 −9 test/fixtures/command-line/help-console.txt
  22. +7 −9 test/fixtures/command-line/help-googlecsi.txt
  23. +4 −7 test/fixtures/command-line/help-har.txt
  24. +4 −7 test/fixtures/command-line/help-history.txt
  25. +6 −9 test/fixtures/command-line/help-listen.txt
  26. +8 −8 test/fixtures/command-line/help-locations.txt
  27. +7 −9 test/fixtures/command-line/help-netlog.txt
  28. +7 −9 test/fixtures/command-line/help-pagespeed.txt
  29. +4 −7 test/fixtures/command-line/help-player.txt
  30. +7 −9 test/fixtures/command-line/help-request.txt
  31. +8 −10 test/fixtures/command-line/help-response.txt
  32. +6 −8 test/fixtures/command-line/help-restart.txt
  33. +22 −15 test/fixtures/command-line/help-results.txt
  34. +15 −14 test/fixtures/command-line/help-screenshot.txt
  35. +5 −8 test/fixtures/command-line/help-status.txt
  36. +175 −76 test/fixtures/command-line/help-test.txt
  37. +173 −0 test/fixtures/command-line/help-testAndWait.txt
  38. +9 −0 test/fixtures/command-line/help-testBalance.txt
  39. +5 −8 test/fixtures/command-line/help-testers.txt
  40. +4 −7 test/fixtures/command-line/help-testinfo.txt
  41. +7 −9 test/fixtures/command-line/help-timeline.txt
  42. +7 −9 test/fixtures/command-line/help-utilization.txt
  43. +7 −8 test/fixtures/command-line/help-video.txt
  44. +20 −20 test/fixtures/command-line/help-waterfall.txt
  45. +50 −38 test/fixtures/command-line/help.txt
  46. +2 −2 test/helpers/nock-server.js
  47. +2 −2 test/helpers/response-objects.js
  48. +2 −2 test/listen-test.js
  49. +2 −2 test/nock-test.js
  50. +39 −29 test/proxy-test.js
  51. +2 −2 test/specs-test.js
  52. +2 −2 test/sync-test.js
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.swp
npm-debug.log
node_modules/
package-lock.json
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
language: node_js
node_js:
- "0.10"
- 17
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:boron
FROM node:dubnium

# Create app directory
RUN mkdir -p /usr/src/app
4 changes: 2 additions & 2 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Copyright (c) 2013 Twitter Inc.
Copyright (c) 2015 Google Inc.
Copyright (c) 2015 Marcel Duran and other contributors
Copyright (c) 2020 Google Inc.
Copyright (c) 2020 Marcel Duran and other contributors

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
22 changes: 16 additions & 6 deletions NOTICE
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-------------- WebPagetest (http://code.google.com/p/webpagetest/) -------------
---------- WebPagetest (https://github.com/WPO-Foundation/webpagetest) ---------

Copyright (c) 2005-2010, AOL, LLC. All rights reserved.
Copyrights licensed under the BSD License.
@@ -8,17 +8,27 @@ Copyrights licensed under the BSD License.
Copyright 2010, 2011, 2012, 2013. All rights reserved.
Licensed under the MIT License.

---------- commander (http://visionmedia.github.com/commander.js/) -------------
--------------- commander (https://github.com/tj/commander.js) -----------------

Copyright (c) 2011 TJ Holowaychuk <tj@vision-media.ca>.
Licensed under the MIT License.

-------------- mocha (http://visionmedia.github.com/mocha/) --------------------
---------------- mocha (https://github.com/mochajs/mocha) ----------------------

Copyright (c) 2011-2013 TJ Holowaychuk <tj@vision-media.ca>.
Copyright (c) 2011-2020 OpenJS Foundation and contributors, https://openjsf.org
Licensed under the MIT License.

------------------- nock (https://github.com/flatiron/nock) --------------------
--------------------- nock (https://github.com/nock/nock) ----------------------

Copyright (c) 2011 Pedro Teixeira. http://about.me/pedroteixeira
Copyright (c) 2011-2019 Pedro Teixeira and other contributors
Licensed under the MIT License.

------------------- csv (https://github.com/adaltas/node-csv) ------------------

Copyright (c) 2010 Adaltas
Licensed under the MIT License.

----------------- entities (https://github.com/fb55/entities) ------------------

Copyright (c) Felix Böhm. All rights reserved.
Licensed under BSD 2-Clause "Simplified" License.
Loading