Skip to content

Improving error message for multiple conflicting fields #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2018
Merged

Improving error message for multiple conflicting fields #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b086325
Improving error message for multiple conflicting fields
schmidt-sebastian Feb 28, 2018
8b10d79
Unignoring conformance tests
schmidt-sebastian Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions conformance/runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,11 @@ const firestore = new Firestore({
const ignoredRe = [
// Node doesn't support field masks for set().
/^set-merge: .*$/,
/set: MergeAll cannot be specified with empty data./, // b/73495873
];

/** If non-empty, list the test cases to run exclusively. */
const exclusiveRe = [
/set: MergeAll cannot be specified with empty data./, // b/73495873
];
const exclusiveRe = [];

const docRef = function(path) {
const relativePath = ResourcePath.fromSlashSeparatedString(path).relativeName;
Expand Down
2 changes: 1 addition & 1 deletion src/transaction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class Transaction {
* @example
* let firstDoc = firestore.doc('col/doc1');
* let secondDoc = firestore.doc('col/doc2');
* let resultDoc = firestore.doc('col/doc2');
* let resultDoc = firestore.doc('col/doc3');
*
* firestore.runTransaction(transaction => {
* return transaction.getAll(firstDoc, secondDoc).then(docs => {
Expand Down
2 changes: 1 addition & 1 deletion src/write-batch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ function validateUpdateMap(data) {

for (let i = 1; i < fields.length; ++i) {
if (fields[i - 1].isPrefixOf(fields[i])) {
throw new Error(`Field "${fields[i - 1]}" has conflicting definitions.`);
throw new Error(`Field "${fields[i - 1]}" was specified multiple times.`);
}
}

Expand Down
16 changes: 8 additions & 8 deletions test/document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,53 +1500,53 @@ describe('update document', function() {
foo: 'foobar',
'foo.bar': 'foobar',
});
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" has conflicting definitions\./);
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" was specified multiple times\./);

assert.throws(() => {
firestore.doc('collectionId/documentId').update({
foo: 'foobar',
'foo.bar.foobar': 'foobar',
});
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" has conflicting definitions\./);
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" was specified multiple times\./);

assert.throws(() => {
firestore.doc('collectionId/documentId').update({
'foo.bar': 'foobar',
foo: 'foobar',
});
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" has conflicting definitions\./);
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" was specified multiple times\./);

assert.throws(() => {
firestore.doc('collectionId/documentId').update({
'foo.bar': 'foobar',
'foo.bar.foo': 'foobar',
});
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo.bar" has conflicting definitions\./);
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo.bar" was specified multiple times\./);

assert.throws(() => {
firestore.doc('collectionId/documentId').update({
'foo.bar': {foo: 'foobar'},
'foo.bar.foo': 'foobar',
});
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo.bar" has conflicting definitions\./);
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo.bar" was specified multiple times\./);

assert.throws(() => {
firestore
.doc('collectionId/documentId')
.update('foo.bar', 'foobar', 'foo', 'foobar');
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" has conflicting definitions\./);
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" was specified multiple times\./);

assert.throws(() => {
firestore
.doc('collectionId/documentId')
.update('foo', {foobar: 'foobar'}, 'foo.bar', {foobar: 'foobar'});
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" has conflicting definitions\./);
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" was specified multiple times\./);

assert.throws(() => {
firestore
.doc('collectionId/documentId')
.update('foo', {foobar: 'foobar'}, 'foo.bar', {foobar: 'foobar'});
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" has conflicting definitions\./);
}, /Argument "dataOrField" is not a valid UpdateMap. Field "foo" was specified multiple times\./);
});

it('with valid field paths', function() {
Expand Down