Catch bad put() values and add tests for bad put/add values

aaronpowell · Mar 26, 2016 · 39f2860 · 39f2860
1 parent 239ad11
commit 39f2860
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 5 deletions.
diff --git a/dist/db.js b/dist/db.js
@@ -447,7 +447,11 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
                         record = record.item;
                         store.put(record, key);
                     } else {
-                        store.put(record);
+                        try {
+                            store.put(record); // Can throw DataError, e.g., if function passed in
+                        } catch (err) {
+                            reject(err);
+                        }
                     }
                 });
             });

diff --git a/dist/db.js.map b/dist/db.js.map
diff --git a/dist/db.min.js b/dist/db.min.js
diff --git a/dist/db.min.js.map b/dist/db.min.js.map
diff --git a/src/db.js b/src/db.js
@@ -374,7 +374,11 @@
                         record = record.item;
                         store.put(record, key);
                     } else {
-                        store.put(record);
+                        try {
+                            store.put(record); // Can throw DataError, e.g., if function passed in
+                        } catch (err) {
+                            reject(err);
+                        }
                     }
                 });
             });

diff --git a/tests/specs/bad-args.js b/tests/specs/bad-args.js
@@ -174,6 +174,24 @@
                 });
             });
 
+            it('should catch bad values', function (done) {
+                db.open({server: this.dbName}).then(function (s) {
+                    var caught = false;
+                    var badValue = function () {};
+                    // var badValue = NaN // This should cause an error to be thrown (a DataError error) per draft spec but doesn't in Chrome, Firefox, or PhantomJS
+                    s.names.put(badValue).catch(function (err) {
+                        expect(err.name).to.equal('DataCloneError');
+                        // expect(err.name).to.equal('DataError'); // Will change to this per draft spec
+                        caught = true;
+                        return s.names.add(badValue);
+                    }).catch(function (err) {
+                        expect(err.name).to.equal('DataCloneError');
+                        expect(caught).to.be.true;
+                        done();
+                    });
+                });
+            });
+
             it('should catch bad range keys', function (done) {
                 var ct = 0;
                 var item = {