Merge pull request #68 from contentful/int-test-fixes

Integration test fixes

Author: trodrigues

lib/create-cda-api.js

@@ -97,13 +97,14 @@ export default function createCdaApi (http, resolveLinksGlobalSetting) {
    * Gets an Entry
    * @memberof CDAClient
    * @param  {string} id
+   * @param  {Object=} query - Object with search parameters. In this method it's only useful for `locale`.
    * @return {Promise<Entities.Entry>} Promise for an Entry
    * @example
    * client.getEntry('entryId')
    * .then(entry => console.log(entry))
    */
-  function getEntry (id) {
-    return http.get('entries/' + id)
+  function getEntry (id, query = {}) {
+    return http.get('entries/' + id, createRequestConfig({query: query}))
     .then(response => wrapEntry(response.data), errorHandler)
   }
 
@@ -127,13 +128,14 @@ export default function createCdaApi (http, resolveLinksGlobalSetting) {
    * Gets an Asset
    * @memberof CDAClient
    * @param  {string} id
+   * @param  {Object=} query - Object with search parameters. In this method it's only useful for `locale`.
    * @return {Promise<Entities.Asset>} Promise for an Asset
    * @example
    * client.getAsset('assetId')
    * .then(asset => console.log(asset))
    */
-  function getAsset (id) {
-    return http.get('assets/' + id)
+  function getAsset (id, query = {}) {
+    return http.get('assets/' + id, createRequestConfig({query: query}))
     .then(response => wrapAsset(response.data), errorHandler)
   }
 

lib/create-http-client.js

@@ -1,4 +1,5 @@
 import version from '../version'
+import qs from 'qs'
 
 /**
  * Create pre configured axios instance
@@ -29,6 +30,7 @@ export default function createHttpClient (axios, {space, accessToken, insecure,
   return axios.create({
     baseURL: `${insecure ? 'http' : 'https'}://${hostname}:${port}/spaces/${space}/`,
     headers: headers,
-    agent: agent
+    agent: agent,
+    paramsSerializer: qs.stringify
   })
 }

package.json

@@ -50,7 +50,8 @@
     "babel-runtime": "^6.3.19",
     "follow-redirects": "0.0.7",
     "json-stringify-safe": "^5.0.1",
-    "lodash": "^4.2.0"
+    "lodash": "^4.2.0",
+    "qs": "^6.1.0"
   },
   "devDependencies": {
     "axios": "^0.9.1",

test/integration/tests.js

@@ -51,6 +51,16 @@ test('Gets entry', t => {
   })
 })
 
+test('Gets an entry with a specific locale', t => {
+  t.plan(1)
+  return client.getEntry('nyancat', {
+    locale: 'tlh'
+  })
+  .then(entry => {
+    t.equal(entry.sys.locale, 'tlh')
+  })
+})
+
 test('Gets entries', t => {
   t.plan(1)
   return client.getEntries()
@@ -59,6 +69,39 @@ test('Gets entries', t => {
   })
 })
 
+test('Gets entries with a specific locale', t => {
+  t.plan(2)
+  return client.getEntries({
+    locale: 'tlh'
+  })
+  .then(response => {
+    t.equal(response.items[0].sys.locale, 'tlh')
+    t.ok(response.items, 'items')
+  })
+})
+
+test('Gets entries with a limit parameter', t => {
+  t.plan(2)
+  return client.getEntries({
+    limit: 2
+  })
+  .then(response => {
+    t.ok(response.items, 'items')
+    t.equal(response.items.length, 2)
+  })
+})
+
+test('Gets entries with a skip parameter', t => {
+  t.plan(2)
+  return client.getEntries({
+    skip: 2
+  })
+  .then(response => {
+    t.ok(response.items, 'items')
+    t.equal(response.skip, 2)
+  })
+})
+
 test('Gets entries with linked includes', t => {
   t.plan(5)
   return client.getEntries({include: 2})
@@ -167,6 +210,17 @@ test('Gets entries with inverse exists query', t => {
   })
 })
 
+test('Gets entries with field link query', t => {
+  t.plan(1)
+  return client.getEntries({
+    content_type: 'cat',
+    'fields.bestFriend.sys.id': 'happycat'
+  })
+  .then(response => {
+    t.equal(response.items[0].sys.id, 'nyancat', 'returned entry has link to specified linked entry')
+  })
+})
+
 test('Gets entries with gte range query', t => {
   t.plan(1)
   return client.getEntries({
@@ -283,6 +337,16 @@ test('Gets asset', t => {
   })
 })
 
+test('Gets an asset with a specific locale', t => {
+  t.plan(1)
+  return client.getEntry('jake', {
+    locale: 'tlh'
+  })
+  .then(asset => {
+    t.equal(asset.sys.locale, 'tlh')
+  })
+})
+
 test('Gets assets', t => {
   t.plan(1)
   return client.getAssets()
@@ -303,3 +367,35 @@ test('Sync space', t => {
     t.equal(response.entries[4].fields.image['en-US'].sys.type, 'Asset', 'links are resolved')
   })
 })
+
+test('Sync space with token', t => {
+  t.plan(5)
+  return client.sync({nextSyncToken: 'w5ZGw6JFwqZmVcKsE8Kow4grw45QdybCnV_Cg8OASMKpwo1UY8K8bsKFwqJrw7DDhcKnM2RDOVbDt1E-wo7CnDjChMKKGsK1wrzCrBzCqMOpZAwOOcOvCcOAwqHDv0XCiMKaOcOxZA8BJUzDr8K-wo1lNx7DnHE'})
+  .then(response => {
+    t.ok(response.entries, 'entries')
+    t.ok(response.assets, 'assets')
+    t.ok(response.deletedEntries, 'deleted entries')
+    t.ok(response.deletedAssets, 'deleted assets')
+    t.ok(response.nextSyncToken, 'next sync token')
+  })
+})
+
+test('Sync spaces assets', t => {
+  t.plan(3)
+  return client.sync({initial: true, type: 'Asset'})
+  .then(response => {
+    t.ok(response.assets, 'assets')
+    t.ok(response.deletedAssets, 'deleted assets')
+    t.ok(response.nextSyncToken, 'next sync token')
+  })
+})
+
+test('Sync space entries by content type', t => {
+  t.plan(3)
+  return client.sync({initial: true, type: 'Entry', content_type: 'dog'})
+  .then(response => {
+    t.ok(response.entries, 'entries')
+    t.ok(response.deletedEntries, 'deleted entries')
+    t.ok(response.nextSyncToken, 'next sync token')
+  })
+})

test/unit/create-request-config-test.js

@@ -0,0 +1,14 @@
+import test from 'tape'
+
+import createRequestConfig from '../../lib/create-request-config'
+
+test('Create request config', t => {
+  const config = createRequestConfig({
+    resolveLinks: true,
+    query: {}
+  })
+
+  t.ok(config.params, 'params property exist')
+  t.notOk(config.params.resolveLinks, 'resolveLinks property is removed from query')
+  t.end()
+})