2.0.5

If global.location.protocol isn't 'http:' or 'https:', use
'http:'. This makes behavior reasonable when the page is
opened directly without using a server.

.travis.yml

@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - "0.12"
+  - "4.1"

README.md

@@ -104,6 +104,21 @@ http.get('/bundle.js', function (res) {
 })
 ```
 
+## Running tests
+
+There are two sets of tests: the tests that run in node (found in `test/node`) and the tests
+that run in the browser (found in `test/browser`). Normally the browser tests run on
+[Sauce Labs](http://saucelabs.com/).
+
+Running `npm test` will run both sets of tests, but in order for the Sauce Labs tests to run
+you will need to sign up for an account (free for open source projects) and put the
+credentials in [a `.zuulrc` file](https://github.com/defunctzombie/zuul/wiki/zuulrc).
+
+To run just the node tests, run `npm run test-node`.
+
+To run the browser tests locally, run `npm run test-browser-local` and point your browser to
+`http://localhost:8080/__zuul`
+
 ## License
 
 MIT. Copyright (C) John Hiesey and other contributors.

index.js

@@ -11,7 +11,12 @@ http.request = function (opts, cb) {
 	else
 		opts = extend(opts)
 
-	var protocol = opts.protocol || ''
+	// Normally, the page is loaded from http or https, so not specifying a protocol
+	// will result in a (valid) protocol-relative url. However, this won't work if
+	// the protocol is something else, like 'file:'
+	var defaultProtocol = global.location.protocol.search(/^https?:$/) === -1 ? 'http:' : ''
+
+	var protocol = opts.protocol || defaultProtocol
 	var host = opts.hostname || opts.host
 	var port = opts.port
 	var path = opts.path || '/'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stream-http",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Streaming http in the browser",
   "main": "index.js",
   "repository": {
@@ -8,7 +8,7 @@
     "url": "git://github.com/jhiesey/stream-http.git"
   },
   "scripts": {
-    "test": "npm run test-node && npm run test-browser",
+    "test": "npm run test-node && ([ -n \"${TRAVIS_PULL_REQUEST}\" -a \"${TRAVIS_PULL_REQUEST}\" != 'false' ] || npm run test-browser)",
     "test-node": "tape test/node/*.js",
     "test-browser": "zuul --no-coverage -- test/browser/*.js",
     "test-browser-local": "zuul --local 8080 --no-coverage -- test/browser/*.js"

test/node/http-browserify.js

@@ -64,6 +64,25 @@ test('Test alt protocol', function(t) {
 	t.end()
 })
 
+test('Test page with \'file:\' protocol', function (t) {
+	var params = {
+		hostname: 'localhost',
+		port: 3000,
+		path: '/bar'
+	}
+
+	var fileLocation = 'file:///home/me/stuff/index.html'
+
+	var normalLocation = global.location
+	global.location = url.parse(fileLocation) // Temporarily change the location
+	var request = http.get(params, noop)
+	global.location = normalLocation // Reset the location
+
+	var resolved = url.resolve(fileLocation, request._opts.url)
+	t.equal(resolved, 'http://localhost:3000/bar', 'Url should be correct')
+	t.end()
+})
+
 test('Test string as parameters', function(t) {
 	var testUrl = '/api/foo'
 	var request = http.get(testUrl, noop)