mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
- Fix all the jasmine test case failures. - Show default value column in Table->Columns grid. Fixes #4353.
This commit is contained in:
committed by
Akshay Joshi
parent
2074534b72
commit
c02705c53c
@@ -241,7 +241,7 @@ describe('ForeignTableColumnSchema', ()=>{
|
||||
server: {user: {name:'postgres', id:0}, server_type: 'pg', version: 90400},
|
||||
table: {}
|
||||
},
|
||||
[{is_collatable: false, label: '"char"', length: true, max_val: 0, min_val: 0, precision: true, typval: ' '}],
|
||||
[{is_collatable: false, label: '"char"', value: '"char"', length: true, max_val: 0, min_val: 0, precision: true, typval: ' '}],
|
||||
()=>[],
|
||||
);
|
||||
let getInitData = ()=>Promise.resolve({});
|
||||
|
||||
@@ -117,7 +117,7 @@ describe('LanguageSchema', ()=>{
|
||||
let setError = jasmine.createSpy('setError');
|
||||
|
||||
state.lanproc = '';
|
||||
state.isTemplate = true;
|
||||
schemaObj.isTemplate = true;
|
||||
schemaObj.validate(state, setError);
|
||||
expect(setError).toHaveBeenCalledWith('lanproc', 'Handler function cannot be empty.');
|
||||
|
||||
|
||||
@@ -14,8 +14,25 @@ import { createMount } from '@material-ui/core/test-utils';
|
||||
import pgAdmin from 'sources/pgadmin';
|
||||
import {messages} from '../fake_messages';
|
||||
import SchemaView from '../../../pgadmin/static/js/SchemaView';
|
||||
import MembershipSchema, {getMembershipSchema} from '../../../pgadmin/browser/server_groups/servers/static/js/membership.ui';
|
||||
import MembershipSchema from '../../../pgadmin/browser/server_groups/servers/static/js/membership.ui';
|
||||
import * as nodeAjax from '../../../pgadmin/browser/static/js/node_ajax';
|
||||
import BaseUISchema from '../../../pgadmin/static/js/SchemaView/base_schema.ui';
|
||||
|
||||
class SchemaInColl extends BaseUISchema {
|
||||
constructor(schemaObj) {
|
||||
super();
|
||||
this.schemaObj = schemaObj;
|
||||
}
|
||||
|
||||
get baseFields() {
|
||||
return [{
|
||||
id: 'collection', label: '', type: 'collection',
|
||||
schema: this.schemaObj,
|
||||
editable: false,
|
||||
canAdd: true, canEdit: false, canDelete: true, hasRole: true,
|
||||
}];
|
||||
}
|
||||
}
|
||||
|
||||
describe('MembershipSchema', ()=>{
|
||||
let mount;
|
||||
@@ -96,10 +113,9 @@ describe('MembershipSchema', ()=>{
|
||||
|
||||
it('MembershipMemberSchema', ()=>{
|
||||
spyOn(nodeAjax, 'getNodeListByName').and.returnValue([]);
|
||||
let memberObj = new getMembershipSchema({}, {server: {user: {name: 'postgres'}}}, {});
|
||||
let ctrl = mount(<SchemaView
|
||||
formType='dialog'
|
||||
schema={memberObj}
|
||||
schema={new SchemaInColl(schemaObj)}
|
||||
viewHelperProps={{
|
||||
mode: 'create',
|
||||
}}
|
||||
|
||||
Reference in New Issue
Block a user