Rejecting 'null' and 'undefined' as arugments for CollectionReference…

….doc()
googleapis · Oct 6, 2017 · 53605a8 · 53605a8
1 parent 522dba1
commit 53605a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/reference.js b/src/reference.js
@@ -1783,10 +1783,10 @@ class CollectionReference extends Query {
    * console.log(`Reference with auto-id: ${documentRefWithAutoId.path}`);
    */
   doc(documentPath) {
-    validate.isOptionalResourcePath('documentPath', documentPath);
-
-    if (!is.defined(documentPath)) {
+    if (arguments.length === 0) {
       documentPath = Firestore.autoId();
+    } else {
+      validate.isResourcePath('documentPath', documentPath);
     }
 
     let path = this._referencePath.append(documentPath);

diff --git a/test/collection.js b/test/collection.js
@@ -52,11 +52,15 @@ describe('Collection interface', function() {
 
     assert.throws(() => {
       collectionRef.doc(false);
-    }, new RegExp('Argument "documentPath" is not a valid ResourcePath. ' + 'Path is not a string.'));
+    }, /Argument "documentPath" is not a valid ResourcePath. Path is not a string./);
 
     assert.throws(() => {
-      collectionRef.doc('doc/col');
-    }, /Argument "documentPath" must point to a document\./);
+      collectionRef.doc(null);
+    }, /Argument "documentPath" is not a valid ResourcePath. Path is not a string./);
+
+    assert.throws(() => {
+      collectionRef.doc(undefined);
+    }, /Argument "documentPath" is not a valid ResourcePath. Path is not a string./);
 
     documentRef = collectionRef.doc('docId/colId/docId');
     assert.ok(is.instance(documentRef, DocumentReference));