fsevents 1.0.5 → 1.0.6

package/node_modules/hawk/test/browser.js

@@ -44,15 +44,15 @@ describe('Browser', function () {
             port: 80
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var bewit = Browser.client.bewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials, ttlSec: 60 * 60 * 24 * 365 * 100, ext: 'some-app-data' });
+            var bewit = Browser.client.bewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials1, ttlSec: 60 * 60 * 24 * 365 * 100, ext: 'some-app-data' });
             req.url += '&bewit=' + bewit;
 
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
+            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials2, attributes) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(attributes.ext).to.equal('some-app-data');
                 done();
             });
@@ -68,15 +68,15 @@ describe('Browser', function () {
             port: 80
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var bewit = Browser.client.bewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials, ttlSec: 60 * 60 * 24 * 365 * 100 });
+            var bewit = Browser.client.bewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials1, ttlSec: 60 * 60 * 24 * 365 * 100 });
             req.url += '&bewit=' + bewit;
 
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
+            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials2, attributes) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 done();
             });
         });
@@ -242,15 +242,15 @@ describe('Browser', function () {
             port: 8080
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' }).field;
             expect(req.authorization).to.exist();
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
                 done();
             });
@@ -270,17 +270,17 @@ describe('Browser', function () {
 
         var payload = 'some not so random text';
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
                 var res = {
                     headers: {
@@ -292,10 +292,10 @@ describe('Browser', function () {
                     }
                 };
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Browser.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(true);
                 done();
             });
         });
@@ -314,17 +314,17 @@ describe('Browser', function () {
 
         var payload = 'some not so random text';
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
                 var res = {
                     headers: {
@@ -336,10 +336,10 @@ describe('Browser', function () {
                     }
                 };
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Browser.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(true);
                 done();
             });
         });
@@ -354,15 +354,15 @@ describe('Browser', function () {
             port: 8080
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', localtimeOffsetMsec: 100000 }).field;
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', localtimeOffsetMsec: 100000 }).field;
             expect(req.authorization).to.exist();
 
-            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 100000 }, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 100000 }, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
                 done();
             });
@@ -382,17 +382,17 @@ describe('Browser', function () {
 
         var payload = 'some not so random text';
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
                 var res = {
                     headers: {
@@ -404,10 +404,10 @@ describe('Browser', function () {
                     }
                 };
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts);
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts);
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, artifacts)).to.equal(true);
                 done();
             });
         });
@@ -426,17 +426,17 @@ describe('Browser', function () {
 
         var payload = 'some not so random text';
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
                 var res = {
                     headers: {
@@ -448,7 +448,7 @@ describe('Browser', function () {
                     }
                 };
 
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, artifacts)).to.equal(true);
                 done();
             });
         });
@@ -463,14 +463,14 @@ describe('Browser', function () {
             port: 8080
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
             Browser.utils.setNtpOffset(60 * 60 * 1000);
-            var header = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' });
+            var header = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' });
             req.authorization = header.field;
             expect(req.authorization).to.exist();
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts2) {
 
                 expect(err).to.exist();
                 expect(err.message).to.equal('Stale timestamp');
@@ -479,24 +479,24 @@ describe('Browser', function () {
                     headers: {
                         'www-authenticate': err.output.headers['WWW-Authenticate']
                     },
-                    getResponseHeader: function (header) {
+                    getResponseHeader: function (lookup) {
 
-                        return res.headers[header.toLowerCase()];
+                        return res.headers[lookup.toLowerCase()];
                     }
                 };
 
                 expect(Browser.utils.getNtpOffset()).to.equal(60 * 60 * 1000);
-                expect(Browser.client.authenticate(res, credentials, header.artifacts)).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, header.artifacts)).to.equal(true);
                 expect(Browser.utils.getNtpOffset()).to.equal(0);
 
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
+                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials2, ext: 'some-app-data' }).field;
                 expect(req.authorization).to.exist();
 
-                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials3, artifacts3) {
 
                     expect(err).to.not.exist();
-                    expect(credentials.user).to.equal('steve');
-                    expect(artifacts.ext).to.equal('some-app-data');
+                    expect(credentials3.user).to.equal('steve');
+                    expect(artifacts3.ext).to.equal('some-app-data');
                     done();
                 });
             });
@@ -512,18 +512,18 @@ describe('Browser', function () {
             port: 8080
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
             var localStorage = new Browser.internals.LocalStorage();
 
             Browser.utils.setStorage(localStorage);
 
             Browser.utils.setNtpOffset(60 * 60 * 1000);
-            var header = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' });
+            var header = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' });
             req.authorization = header.field;
             expect(req.authorization).to.exist();
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts2) {
 
                 expect(err).to.exist();
                 expect(err.message).to.equal('Stale timestamp');
@@ -532,26 +532,26 @@ describe('Browser', function () {
                     headers: {
                         'www-authenticate': err.output.headers['WWW-Authenticate']
                     },
-                    getResponseHeader: function (header) {
+                    getResponseHeader: function (lookup) {
 
-                        return res.headers[header.toLowerCase()];
+                        return res.headers[lookup.toLowerCase()];
                     }
                 };
 
                 expect(parseInt(localStorage.getItem('hawk_ntp_offset'))).to.equal(60 * 60 * 1000);
                 expect(Browser.utils.getNtpOffset()).to.equal(60 * 60 * 1000);
-                expect(Browser.client.authenticate(res, credentials, header.artifacts)).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, header.artifacts)).to.equal(true);
                 expect(Browser.utils.getNtpOffset()).to.equal(0);
                 expect(parseInt(localStorage.getItem('hawk_ntp_offset'))).to.equal(0);
 
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
+                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials2, ext: 'some-app-data' }).field;
                 expect(req.authorization).to.exist();
 
-                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials3, artifacts3) {
 
                     expect(err).to.not.exist();
-                    expect(credentials.user).to.equal('steve');
-                    expect(artifacts.ext).to.equal('some-app-data');
+                    expect(credentials3.user).to.equal('steve');
+                    expect(artifacts3.ext).to.equal('some-app-data');
                     done();
                 });
             });
@@ -571,17 +571,17 @@ describe('Browser', function () {
 
         var payload = 'some not so random text';
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
                 var res = {
                     headers: {
@@ -593,10 +593,10 @@ describe('Browser', function () {
                     }
                 };
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts);
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts);
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Browser.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(false);
+                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(false);
                 done();
             });
         });
@@ -611,13 +611,13 @@ describe('Browser', function () {
             port: 8080
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
                 done();
             });
@@ -633,16 +633,16 @@ describe('Browser', function () {
             port: 8080
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload('hola!', credentials, artifacts)).to.be.true();
-                expect(Hawk.server.authenticatePayload('hello!', credentials, artifacts)).to.be.false();
+                expect(Hawk.server.authenticatePayload('hola!', credentials2, artifacts)).to.be.true();
+                expect(Hawk.server.authenticatePayload('hello!', credentials2, artifacts)).to.be.false();
                 done();
             });
         });
@@ -657,13 +657,13 @@ describe('Browser', function () {
             port: 8080
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', app: 'asd23ased' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', app: 'asd23ased' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
                 expect(artifacts.app).to.equal('asd23ased');
                 done();
@@ -680,13 +680,13 @@ describe('Browser', function () {
             port: 8080
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', app: 'asd23ased', dlg: '23434szr3q4d' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', app: 'asd23ased', dlg: '23434szr3q4d' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
                 expect(artifacts.app).to.equal('asd23ased');
                 expect(artifacts.dlg).to.equal('23434szr3q4d');
@@ -704,10 +704,10 @@ describe('Browser', function () {
             port: 8080
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, { payload: 'byebye!' }, function (err, credentials, artifacts) {
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, { payload: 'byebye!' }, function (err, credentials2, artifacts) {
 
                 expect(err).to.exist();
                 expect(err.output.payload.message).to.equal('Bad payload hash');
@@ -725,15 +725,15 @@ describe('Browser', function () {
             port: 8080
         };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' }).field;
             req.url = '/something/else';
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.exist();
-                expect(credentials).to.exist();
+                expect(credentials2).to.exist();
                 done();
             });
         });
@@ -1123,15 +1123,15 @@ describe('Browser', function () {
 
             it('generates an authorization then successfully parse it', function (done) {
 
-                credentialsFunc('123456', function (err, credentials) {
+                credentialsFunc('123456', function (err, credentials1) {
 
-                    var auth = Browser.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                    var auth = Browser.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                     expect(auth).to.exist();
 
-                    Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                    Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
                         expect(err).to.not.exist();
-                        expect(credentials.user).to.equal('steve');
+                        expect(credentials2.user).to.equal('steve');
                         done();
                     });
                 });
@@ -1429,19 +1429,52 @@ describe('Browser', function () {
 
         describe('parseUri()', function () {
 
+            it('returns empty object on invalid', function (done) {
+
+                var uri = Browser.utils.parseUri('ftp');
+                expect(uri).to.deep.equal({ host: '', port: '', resource: '' });
+                done();
+            });
+
             it('returns empty port when unknown scheme', function (done) {
 
-                var uri = Browser.utils.parseUri('ftp://domain');
+                var uri = Browser.utils.parseUri('ftp://example.com');
                 expect(uri.port).to.equal('');
                 done();
             });
 
             it('returns default port when missing', function (done) {
 
-                var uri = Browser.utils.parseUri('http://');
+                var uri = Browser.utils.parseUri('http://example.com');
                 expect(uri.port).to.equal('80');
                 done();
             });
+
+            it('handles unusual characters correctly', function (done) {
+
+                var parts = {
+                    protocol: 'http+vnd.my-extension',
+                    user: 'user!$&\'()*+,;=%40my-domain.com',
+                    password: 'pass!$&\'()*+,;=%40:word',
+                    hostname: 'foo-bar.com',
+                    port: '99',
+                    pathname: '/path/%40/!$&\'()*+,;=:@/',
+                    query: 'query%40/!$&\'()*+,;=:@/?',
+                    fragment: 'fragm%40/!$&\'()*+,;=:@/?'
+                };
+
+                parts.userInfo = parts.user + ':' + parts.password;
+                parts.authority = parts.userInfo + '@' + parts.hostname + ':' + parts.port;
+                parts.relative = parts.pathname + '?' + parts.query;
+                parts.resource = parts.relative + '#' + parts.fragment;
+                parts.source = parts.protocol + '://' + parts.authority + parts.resource;
+
+                var uri = Browser.utils.parseUri(parts.source);
+                expect(uri.host).to.equal('foo-bar.com');
+                expect(uri.port).to.equal('99');
+                expect(uri.resource).to.equal(parts.pathname + '?' + parts.query);
+                done();
+            });
         });
 
         var str = 'https://www.google.ca/webhp?sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8#q=url';