Merge pull request #35 from holidayextras/v0.6.0

v0.6.0 - Updating dependencies
holidayextras · Jun 22, 2016 · fd54d4e · fd54d4e
2 parents 7a51a6f + 0f15954
commit fd54d4e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+ - 2016-06-22 - v0.6.0 Updating all dependencies
  - 2016-06-08 - v0.5.1 Fixes retrieval of many-to-one relationships
  - 2016-04-22 - v0.5.0 Safer error extraction, relationship deduplication bug, adding relationships to new resources
  - 2016-03-10 - v0.4.3 Error handling when fetching related resources that don't exist

diff --git a/karma.local.conf.js b/karma.local.conf.js
@@ -14,7 +14,11 @@ module.exports = function(config) {
     singleRun: true,
     concurrency: 1,
     client: {
-      captureConsole: true
+      captureConsole: true,
+      timeout: 10000,
+      mocha: {
+        timeout: 10000
+      }
     }
   });
 };
diff --git a/karma.saucelabs.conf.js b/karma.saucelabs.conf.js
@@ -62,7 +62,10 @@ module.exports = function(config) {
     concurrency: 5,
     client: {
       captureConsole: true,
-      timeout: 10000
+      timeout: 10000,
+      mocha: {
+        timeout: 10000
+      }
     },
     startConnect: true,
     connectOptions: {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsonapi-client",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "A clientside module designed to make it really easy to consume a json:api service.",
   "keywords": [
     "jsonapi",
@@ -16,27 +16,27 @@
   },
   "dependencies": {
     "async": "1.5.2",
-    "object-assign": "4.0.1",
+    "object-assign": "4.1.0",
     "perry": "0.1.3",
     "promise": "7.1.1",
-    "superagent": "1.7.1"
+    "superagent": "2.0.0"
   },
   "devDependencies": {
-    "blanket": "1.2.1",
-    "browserify": "13.0.0",
-    "coveralls": "2.11.6",
+    "blanket": "1.2.3",
+    "browserify": "13.0.1",
+    "coveralls": "2.11.9",
     "eslint": "0.24.0",
-    "jsonapi-server": "1.3.0",
-    "karma": "0.13.19",
-    "karma-chrome-launcher": "0.2.2",
-    "karma-firefox-launcher": "0.1.7",
-    "karma-mocha": "0.2.1",
-    "karma-phantomjs-launcher": "0.2.3",
-    "karma-sauce-launcher": "0.3.0",
-    "karma-spec-reporter": "0.0.23",
-    "mocha": "2.2.5",
-    "mocha-lcov-reporter": "0.0.2",
-    "phantomjs": "1.9.19",
+    "jsonapi-server": "1.13.0",
+    "karma": "0.13.22",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-firefox-launcher": "1.0.0",
+    "karma-mocha": "1.0.1",
+    "karma-phantomjs-launcher": "1.0.0",
+    "karma-sauce-launcher": "1.0.0",
+    "karma-spec-reporter": "0.0.26",
+    "mocha": "2.5.3",
+    "mocha-lcov-reporter": "1.2.0",
+    "phantomjs": "2.1.7",
     "plato": "1.5.0",
     "uglifyjs": "2.4.10"
   },

diff --git a/test/_testServer.js b/test/_testServer.js
@@ -3,6 +3,13 @@
 var jsonApiTestServer = require("jsonapi-server/example/server.js");
 if (!jsonApiTestServer.start) return;
 
+jsonApiTestServer.getExpressServer().use(function (req, res, next) {
+  res.header("Access-Control-Allow-Origin", "*");
+  res.header("Access-Control-Allow-Methods", "POST, GET, PUT, DELETE, OPTIONS");
+  res.header("Access-Control-Allow-Headers", "Content-Type");
+  next();
+});
+
 before(function() {
   jsonApiTestServer.start();
 });

diff --git a/test/read.js b/test/read.js
@@ -31,6 +31,8 @@ describe("Testing jsonapi-client", function() {
                 "status": "published",
                 "content": "na",
                 "author": "[Circular]",
+                "created": "2016-01-05",
+                "views": "10",
                 "tags": [
                   {
                     "type": "tags",
@@ -75,7 +77,7 @@ describe("Testing jsonapi-client", function() {
     it("passes back server errors", function(done) {
       client.find("articles", { filter: { foobar: "<M" } }, function(err) {
         assert.ok(err instanceof Error);
-        assert.equal(err.message, "\"articles do not have property foobar\"");
+        assert.equal(err.message, "\"articles do not have attribute or relationship 'foobar'\"");
 
         done();
       });
@@ -148,6 +150,7 @@ describe("Testing jsonapi-client", function() {
           "title": "Penguins",
           "url": "http://www.example.com/penguins",
           "width": 60,
+          "raw": false,
           "photographer": {
             "id": "d850ea75-4427-4f81-8595-039990aeede5",
             "type": "people"
@@ -257,6 +260,7 @@ describe("Testing jsonapi-client", function() {
           "title": "Penguins",
           "url": "http://www.example.com/penguins",
           "width": 60,
+          "raw": false,
           "photographer": {
             "id": "d850ea75-4427-4f81-8595-039990aeede5",
             "type": "people"