Merge pull request #65 from mozilla-services/64-support-falsy-batch-l…

…imit Add safety check if batch limit setting is falsy (fixes #64)
Kinto · Jul 15, 2015 · d1b8444 · d1b8444
2 parents 767ee54 + dc4e933
commit d1b8444
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/api.js b/src/api.js
@@ -199,7 +199,7 @@ export default class Api {
     return this.fetchServerSettings()
       .then(serverSettings => {
         const maxRequests = serverSettings["cliquet.batch_max_requests"];
-        if (records.length > maxRequests) {
+        if (maxRequests && records.length > maxRequests) {
           return Promise.all(partition(records, maxRequests).map(chunk => {
             return this.batch(bucketName, collName, chunk, options);
           }))

diff --git a/test/api_test.js b/test/api_test.js
@@ -550,6 +550,17 @@ describe("Api", () => {
           .should.become([1, 2, 3, 4]);
       });
 
+      it("should not chunk batch requests if setting is falsy", () => {
+        api.fetchServerSettings.returns(Promise.resolve({
+          "cliquet.batch_max_requests": null
+        }));
+        sandbox.stub(root, "fetch").returns(fakeServerResponse(200, {
+          responses: []
+        }));
+        return api.batch("blog", "articles", moreOperations)
+          .then(_ => sinon.assert.calledOnce(fetch));
+      });
+
       it("should map initial records to conflict objects", () => {
         sandbox.stub(root, "fetch")
           .onFirstCall().returns(fakeServerResponse(200, {

diff --git a/test/scripts/setup-kinto.sh b/test/scripts/setup-kinto.sh
@@ -15,3 +15,7 @@ git checkout $KINTO_RELEASE
 cp $REPO_ROOT/test/scripts/kinto.ini $KINTO_ROOT/config/kinto.ini
 
 make serve &
+
+#Prevent race condition where integration tests start while server 
+# isn't running yet.
+sleep 3