Merge pull request #46 from dadi/patch/core-update

Update core dependency version

Author: eduardoboucas

README.md

@@ -3,7 +3,7 @@
 > A high-level library for interacting with DADI API
 
 [![npm (scoped)](https://img.shields.io/npm/v/@dadi/api-wrapper.svg?maxAge=10800&style=flat-square)](https://www.npmjs.com/package/@dadi/api-wrapper)
-![coverage](https://img.shields.io/badge/coverage-96%25-brightgreen.svg?style=flat-square)
+![coverage](https://img.shields.io/badge/coverage-93%25-brightgreen.svg?style=flat)
 [![Build Status](https://travis-ci.org/dadi/api-wrapper.svg?branch=master)](https://travis-ci.org/dadi/api-wrapper)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](http://standardjs.com/)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)](https://github.com/semantic-release/semantic-release)

package.json

@@ -11,8 +11,8 @@
   "author": "Eduardo Boucas <mail@eduardoboucas.com>",
   "license": "GPL",
   "dependencies": {
-    "@dadi/api-wrapper-core": "1.x.0",
-    "@dadi/passport": "^1.2.0",
+    "@dadi/api-wrapper-core": "~2.0.0",
+    "@dadi/passport": "~1.5.0",
     "debug": "^2.6.1",
     "query-string": "^4.1.0",
     "request-promise": "^2.0.1",

scripts/coverage.js

@@ -28,7 +28,7 @@ coberturaBadger(opts, function parsingResults (err, badgeStatus) {
   // open the README.md and add this url
   fs.readFile(readme, {encoding: 'utf-8'}, function (err, body) {
     body = body.replace(/(!\[coverage\]\()(.+?)(\))/g, function (whole, a, b, c) {
-      return a + badgeUrl.replace('%', '%25') + '-square' + c
+      return a + badgeUrl + c
     })
 
     fs.writeFile(readme, body, {encoding: 'utf-8'}, function (err) {

test/unit/helpers.js

@@ -109,7 +109,7 @@ describe('Helpers', function (done) {
       done()
     })
 
-    it('should append limit to the querystring if specified', function (done) {
+    it('should append page to the querystring if specified', function (done) {
       var query = { filter: JSON.stringify({ name: 'John' }), page: 33 }
       var expectedQuerystring  = '?' + decodeURIComponent(querystring.stringify(query))
 
@@ -121,7 +121,7 @@ describe('Helpers', function (done) {
     })
 
     it('should append limit to the querystring if specified', function (done) {
-      var query = { filter: JSON.stringify({ name: 'John' }), count: 10 }
+      var query = { count: 10, filter: JSON.stringify({ name: 'John' }) }
       var expectedQuerystring  = '?' + decodeURIComponent(querystring.stringify(query))
 
       wrapper.useVersion('1.0').useDatabase('test').in('collectionOne').whereFieldIsEqualTo('name', 'John').limitTo(10)
@@ -154,7 +154,7 @@ describe('Helpers', function (done) {
     })
 
     it('should append fields to the querystring if specified', function (done) {
-      var query = { filter: JSON.stringify({ name: 'John' }), fields: JSON.stringify({ name: 1 }) }
+      var query = { fields: JSON.stringify({ name: 1 }), filter: JSON.stringify({ name: 'John' }) }
       var expectedQuerystring  = '?' + decodeURIComponent(querystring.stringify(query))
 
       wrapper.useVersion('1.0').useDatabase('test').in('collectionOne').whereFieldIsEqualTo('name', 'John').useFields(['name'])
@@ -165,7 +165,7 @@ describe('Helpers', function (done) {
     })
 
     it('should append compose value to the querystring if specified and `true`', function (done) {
-      var query = { filter: JSON.stringify({ name: 'John' }), compose: true }
+      var query = { compose: true, filter: JSON.stringify({ name: 'John' }) }
       var expectedQuerystring  = '?' + decodeURIComponent(querystring.stringify(query))
 
       wrapper.useVersion('1.0').useDatabase('test').in('collectionOne').whereFieldIsEqualTo('name', 'John').withComposition(true)
@@ -176,7 +176,7 @@ describe('Helpers', function (done) {
     })
 
     it('should append compose value to the querystring if specified and `false`', function (done) {
-      var query = { filter: JSON.stringify({ name: 'John' }), compose: false }
+      var query = { compose: false, filter: JSON.stringify({ name: 'John' }) }
       var expectedQuerystring  = '?' + decodeURIComponent(querystring.stringify(query))
 
       wrapper.useVersion('1.0').useDatabase('test').in('collectionOne').whereFieldIsEqualTo('name', 'John').withComposition(false)