Skip to content

Fix flaky test #2078

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 9 commits into from
Jun 16, 2016
Merged

Fix flaky test #2078

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0e189ba
Debug flaky test
drew-gross Jun 16, 2016
22d2c1d
create new object instead of modifying and assigning existing object
drew-gross Jun 16, 2016
fb1f276
use getOneSchema instead of this.data when updating fields
drew-gross Jun 16, 2016
2a46345
Remove debug stuff
drew-gross Jun 16, 2016
bdf1363
Don't try to validate existing fields
drew-gross Jun 16, 2016
34480c2
run just one test
drew-gross Jun 16, 2016
70b42e4
Verbose test all
drew-gross Jun 16, 2016
436b120
Use schema instead of this.data
drew-gross Jun 16, 2016
cb6407d
Switch to all tests
drew-gross Jun 16, 2016
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
68 changes: 37 additions & 31 deletions src/Controllers/SchemaController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,9 @@ class SchemaController {
}

updateClass(className, submittedFields, classLevelPermissions, database) {
return this.hasClass(className)
.then(hasClass => {
if (!hasClass) {
throw new Parse.Error(Parse.Error.INVALID_CLASS_NAME, `Class ${className} does not exist.`);
}
let existingFields = Object.assign(this.data[className], {_id: className});
return this.getOneSchema(className)
.then(schema => {
let existingFields = schema.fields;
Object.keys(submittedFields).forEach(name => {
let field = submittedFields[name];
if (existingFields[name] && field.__op !== 'Delete') {
Expand All @@ -321,7 +318,7 @@ class SchemaController {
});

let newSchema = buildMergedSchemaObject(existingFields, submittedFields);
let validationError = this.validateSchemaData(className, newSchema, classLevelPermissions);
let validationError = this.validateSchemaData(className, newSchema, classLevelPermissions, Object.keys(existingFields));
if (validationError) {
throw new Parse.Error(validationError.code, validationError.error);
}
Expand Down Expand Up @@ -356,6 +353,13 @@ class SchemaController {
classLevelPermissions: this.perms[className]
}));
})
.catch(error => {
if (error === undefined) {
throw new Parse.Error(Parse.Error.INVALID_CLASS_NAME, `Class ${className} does not exist.`);
} else {
throw error;
}
})
}

// Returns a promise that resolves successfully to the new schema
Expand Down Expand Up @@ -398,25 +402,27 @@ class SchemaController {
error: invalidClassNameMessage(className),
};
}
return this.validateSchemaData(className, fields, classLevelPermissions);
return this.validateSchemaData(className, fields, classLevelPermissions, []);
}

validateSchemaData(className, fields, classLevelPermissions) {
validateSchemaData(className, fields, classLevelPermissions, existingFieldNames) {
for (let fieldName in fields) {
if (!fieldNameIsValid(fieldName)) {
return {
code: Parse.Error.INVALID_KEY_NAME,
error: 'invalid field name: ' + fieldName,
};
}
if (!fieldNameIsValidForClass(fieldName, className)) {
return {
code: 136,
error: 'field ' + fieldName + ' cannot be added',
};
if (!existingFieldNames.includes(fieldName)) {
if (!fieldNameIsValid(fieldName)) {
return {
code: Parse.Error.INVALID_KEY_NAME,
error: 'invalid field name: ' + fieldName,
};
}
if (!fieldNameIsValidForClass(fieldName, className)) {
return {
code: 136,
error: 'field ' + fieldName + ' cannot be added',
};
}
const error = fieldTypeIsInvalid(fields[fieldName]);
if (error) return { code: error.code, error: error.message };
}
const error = fieldTypeIsInvalid(fields[fieldName]);
if (error) return { code: error.code, error: error.message };
}

for (let fieldName in defaultColumns[className]) {
Expand Down Expand Up @@ -528,19 +534,19 @@ class SchemaController {
throw new Parse.Error(136, `field ${fieldName} cannot be changed`);
}

return this.reloadData()
.then(() => this.hasClass(className))
.then(hasClass => {
if (!hasClass) {
return this.getOneSchema(className)
.catch(error => {
if (error === undefined) {
throw new Parse.Error(Parse.Error.INVALID_CLASS_NAME, `Class ${className} does not exist.`);
}
if (!this.data[className][fieldName]) {
throw new Parse.Error(255, `Field ${fieldName} does not exist, cannot delete.`);
} else {
throw error;
}
})
.then(() => this.getOneSchema(className))
.then(schema => {
if (this.data[className][fieldName].type == 'Relation') {
if (!schema.fields[fieldName]) {
throw new Parse.Error(255, `Field ${fieldName} does not exist, cannot delete.`);
}
if (schema.fields[fieldName].type == 'Relation') {
//For relations, drop the _Join table
return database.adapter.deleteFields(className, schema, [fieldName])
.then(() => database.adapter.deleteClass(`_Join:${fieldName}:${className}`));
Expand Down