Merge pull request #62 from mozilla-services/upgrade-to-kinto-1.3

Fixes #54 - Upgrade to Kinto server v1.3.
Kinto · Jul 14, 2015 · 48731dd · 48731dd
2 parents 98bae34 + d396bb7
commit 48731dd
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 33 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -1,6 +1,6 @@
 function main() {
   var db = new Kinto({
-    remote: "http://0.0.0.0:8888/v1",
+    remote: "https://kinto.dev.mozaws.net/v1/",
     headers: {Authorization: "Basic " + btoa("user:pass")}
   });
   var tasks = db.collection("tasks");

diff --git a/dist/kinto.dev.js b/dist/kinto.dev.js
diff --git a/dist/kinto.min.js b/dist/kinto.min.js
diff --git a/src/api.js b/src/api.js
@@ -158,10 +158,7 @@ export default class Api {
         results.conflicts.push({
           type: "outgoing",
           local: records[index],
-          // TODO: Once we get record information in this response object,
-          // add it; for now, that's the error json body only.
-          // Ref https://github.com/mozilla-services/kinto/issues/122
-          remote: response.body
+          remote: response.body.details && response.body.details.existing || null
         });
       } else {
         results.errors.push({

diff --git a/test/api_test.js b/test/api_test.js
@@ -494,7 +494,11 @@ describe("Api", () => {
             responses: [
               { status: 412,
                 path: `/${SPV}/buckets/blog/collections/articles/records/1`,
-                body: { invalid: true }},
+                body: {
+                  details: {
+                    existing: {title: "foo"}
+                  }
+                }},
             ]
           }));
 
@@ -503,7 +507,7 @@ describe("Api", () => {
               conflicts: [{
                 type: "outgoing",
                 local: published[0],
-                remote: { invalid: true }
+                remote: {title: "foo"}
               }],
               skipped:   [],
               errors:    [],
@@ -545,34 +549,34 @@ describe("Api", () => {
         sandbox.stub(root, "fetch")
           .onFirstCall().returns(fakeServerResponse(200, {
             responses: [
-              {status: 412, body: {data: 1}},
-              {status: 412, body: {data: 2}},
-              {status: 412, body: {data: 3}},
+              {status: 412, body: {details: {existing: {id: 1}}}},
+              {status: 412, body: {details: {existing: {id: 2}}}},
+              {status: 412, body: {}},
             ]
           }))
           .onSecondCall().returns(fakeServerResponse(200, {
             responses: [
-              {status: 412, body: {data: 4}},
+              {status: 412, body: {details: {existing: {id: 4}}}},
             ]
           }));
         return api.batch("blog", "articles", moreOperations)
           .then(res => res.conflicts)
           .should.become([{
             type: "outgoing",
-            local: {id: 1, title: "foo"},
-            remote: {data: 1}
+            local:  {id: 1, title: "foo"},
+            remote: {id: 1}
           }, {
             type: "outgoing",
-            local: {id: 2, title: "bar"},
-            remote: {data: 2}
+            local:  {id: 2, title: "bar"},
+            remote: {id: 2}
           }, {
             type: "outgoing",
-            local: {id: 3, title: "baz"},
-            remote: {data: 3}
+            local:  {id: 3, title: "baz"},
+            remote: null
           }, {
             type: "outgoing",
-            local: {id: 4, title: "qux"},
-            remote: {data: 4}
+            local:  {id: 4, title: "qux"},
+            remote: {id: 4}
           }]);
       });
 

diff --git a/test/integration_test.js b/test/integration_test.js
@@ -213,13 +213,7 @@ describe("Integration tests", () => {
         expect(syncResult.conflicts).to.have.length.of(1);
         expect(syncResult.conflicts[0].type).eql("outgoing");
         expect(syncResult.conflicts[0].local.title).eql("foo");
-        // TODO: https://github.com/mozilla-services/kinto/issues/122
-        expect(cleanRecord(syncResult.conflicts[0].remote)).eql({
-          "code": 412,
-          "errno": 999,
-          "error": "Precondition Failed",
-          "message": "Failed batch subrequest",
-        });
+        expect(syncResult.conflicts[0].remote.title).eql("foo");
       });
 
       it("should not have skipped records", () => {

diff --git a/test/scripts/setup-kinto.sh b/test/scripts/setup-kinto.sh
@@ -7,7 +7,7 @@ fi
 
 REPO_ROOT=`pwd`
 KINTO_ROOT=/var/tmp/kinto
-KINTO_RELEASE=1.2.0
+KINTO_RELEASE=1.3.0
 
 git clone https://github.com/mozilla-services/kinto.git $KINTO_ROOT
 cd $KINTO_ROOT