Permalink
Browse files

Merge branch 'master' of github.com:tedeh/jayson

Conflicts:
	test/server.test.js
  • Loading branch information...
tedeh committed Dec 23, 2013
2 parents 4dcd85f + 03464d3 commit 6d567ba5e7f414b4729294526b4f4eceaca3f63e
Showing with 5 additions and 3 deletions.
  1. +3 −1 README.md
  2. +1 −1 test/client.test.js
  3. +1 −1 test/utils.test.js
View
@@ -5,8 +5,10 @@ Jayson is a [JSON-RPC 2.0][jsonrpc-spec] compliant server and client written in
[jsonrpc-spec]: http://jsonrpc.org/spec.html
[jsonrpc1-spec]: http://json-rpc.org/wiki/specification
[node.js]: http://nodejs.org/
+[travis]: https://travis-ci.org/tedeh/jayson
+[travis-img]: https://travis-ci.org/tedeh/jayson.png?branch=master
-*Build status:* [![Build Status][travis-img]][travis]
+**Build status:** [![Build Status][travis-img]][travis]
## Table of contents
View
@@ -143,7 +143,7 @@ describe('jayson client instance', function() {
should.not.exist(err);
should.not.exist(error);
should.exist(response);
- response.should.be.a('number').and.equal(params.a + params.b);
+ response.should.be.a.Number.and.equal(params.a + params.b);
done();
});
});
View
@@ -10,7 +10,7 @@ describe('utils', function() {
it('exists', function() {
utils.should.have.property('request');
- utils.request.should.be.a('function');
+ utils.request.should.be.a.Function;
});
it('should throw a TypeError on an invalid method argument', function() {

0 comments on commit 6d567ba

Please sign in to comment.