IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure port and username should not be mandatory when a service is provided. Fixes #4642

Browse Source
This commit is contained in:
Akshay Joshi
2019-09-13 11:54:16 +05:30
parent 9a69d27009
commit da553eec9b
5 changed files with 105 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web/regression/javascript/browser/server_groups/servers/model_validation_spec.js
View File

@@ -47,9 +47,10 @@ describe('Server#ModelValidation', () => {
});
});
describe('Service id present', () => {
describe('Service id and Maintenance database present', () => {
it('does not set any error in the model', () => {
model.allValues['service'] = 'asdfg';
model.allValues['db'] = 'postgres';
expect(modelValidation.validate()).toBeNull();
expect(model.errorModel.set).toHaveBeenCalledWith({});
});
@@ -147,14 +148,12 @@ describe('Server#ModelValidation', () => {
});
describe('Service id present', () => {
it('does not set any error in the model', () => {
it('set the "Maintenance database must be specified." error', () => {
model.allValues['name'] = 'some name';
model.allValues['service'] = 'asdfg';
expect(modelValidation.validate()).toEqual('Name must be specified.');
expect(model.errorModel.set).toHaveBeenCalledTimes(1);
expect(modelValidation.validate()).toEqual('Maintenance database must be specified.');
expect(model.errorModel.set).toHaveBeenCalledWith({
name: 'Name must be specified.',
username: 'Username must be specified.',
port: 'Port must be specified.',
db: 'Maintenance database must be specified.',
});
});
});