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

Un-vendorise React, now that it contains bug fixes we need.

Browse Source
This commit is contained in:
Joao Pedro De Almeida Pereira
2018-02-19 10:53:54 +00:00
committed by Dave Page
parent 15862e903a
commit 0677ad254a
245 changed files with 425 additions and 69514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/regression/javascript/code_mirror_spec.jsx
View File

@@ -13,7 +13,7 @@ import CodeMirror from '../../pgadmin/static/jsx/history/detail/code_mirror';
import jasmineEnzyme from 'jasmine-enzyme';
import {shallow} from 'enzyme';
import './helper/enzyme.helper';
describe('CodeMirror', () => {
beforeEach(() => {

13
web/regression/javascript/helper/enzyme.helper.js Normal file
View File

@@ -0,0 +1,13 @@
/////////////////////////////////////////////////////////////
//
// pgAdmin 4 - PostgreSQL Tools
//
// Copyright (C) 2013 - 2018, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
//////////////////////////////////////////////////////////////
import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
Enzyme.configure({adapter: new Adapter()});

1
web/regression/javascript/history/history_collection_spec.js
View File

@@ -8,6 +8,7 @@
//////////////////////////////////////////////////////////////
import HistoryCollection from '../../../pgadmin/static/js/history/history_collection';
import '../helper/enzyme.helper';
describe('historyCollection', function () {
let historyCollection, historyModel, onChangeSpy, onResetSpy;

73
web/regression/javascript/history/query_history_spec.jsx
View File

@@ -23,6 +23,8 @@ import HistoryCollection from '../../../pgadmin/static/js/history/history_collec
import clipboard from '../../../pgadmin/static/js/selection/clipboard';
import {mount} from 'enzyme';
import '../helper/enzyme.helper';
describe('QueryHistory', () => {
let historyCollection;
@@ -40,12 +42,12 @@ describe('QueryHistory', () => {
describe('when we switch to the query history tab', () => {
beforeEach(() => {
historyWrapper.node.refocus();
spyOn(historyWrapper.node, 'retrieveSelectedQuery');
historyWrapper.instance().refocus();
spyOn(historyWrapper.instance(), 'retrieveSelectedQuery');
});
it('does not try to focus on any element', () => {
expect(historyWrapper.node.retrieveSelectedQuery).not.toHaveBeenCalled();
expect(historyWrapper.instance().retrieveSelectedQuery).not.toHaveBeenCalled();
});
});
@@ -66,6 +68,7 @@ describe('QueryHistory', () => {
let queryEntries;
let queryDetail;
let isInvisibleSpy;
let queryHistoryEntriesComponent;
describe('when two SQL queries were executed', () => {
@@ -89,8 +92,8 @@ describe('QueryHistory', () => {
historyWrapper = mount(<QueryHistory historyCollection={historyCollection}/>);
const queryHistoryEntriesComponent = historyWrapper.find(QueryHistoryEntries);
isInvisibleSpy = spyOn(queryHistoryEntriesComponent.node, 'isInvisible')
queryHistoryEntriesComponent = historyWrapper.find(QueryHistoryEntries);
isInvisibleSpy = spyOn(queryHistoryEntriesComponent.instance(), 'isInvisible')
.and.returnValue(false);
queryEntries = queryHistoryEntriesComponent.find(QueryHistoryEntry);
@@ -113,55 +116,60 @@ describe('QueryHistory', () => {
});
it('renders the most recent query as selected', () => {
expect(queryEntries.at(0).nodes.length).toBe(1);
expect(queryEntries.at(0).hasClass('selected')).toBeTruthy();
expect(queryEntries.at(0).getElements().length).toBe(1);
expect(queryEntries.at(0).render().hasClass('selected')).toBeTruthy();
});
it('renders the older query as not selected', () => {
expect(queryEntries.at(1).nodes.length).toBe(1);
expect(queryEntries.at(1).hasClass('selected')).toBeFalsy();
expect(queryEntries.at(1).hasClass('error')).toBeTruthy();
expect(queryEntries.at(1).getElements().length).toBe(1);
expect(queryEntries.at(1).render().hasClass('selected')).toBeFalsy();
expect(queryEntries.at(1).render().hasClass('error')).toBeTruthy();
});
describe('when the selected query is the most recent', () => {
describe('when we press arrow down', () => {
beforeEach(() => {
pressArrowDownKey(queryEntries.parent().at(0));
pressArrowDownKey(queryHistoryEntriesComponent.find('.list-item').at(0));
});
it('should select the next query', () => {
expect(queryEntries.at(1).nodes.length).toBe(1);
expect(queryEntries.at(1).hasClass('selected')).toBeTruthy();
expect(queryEntries.at(1).getElements().length).toBe(1);
expect(queryEntries.at(1).render().hasClass('selected')).toBeTruthy();
});
it('should display the corresponding detail on the right pane', () => {
expect(queryDetail.at(0).text()).toContain('message from second sql query');
expect(queryDetail.at(0).render().text()).toContain('message from second sql query');
});
describe('when arrow down pressed again', () => {
it('should not change the selected query', () => {
pressArrowDownKey(queryEntries.parent().at(0));
pressArrowDownKey(queryHistoryEntriesComponent.find('.list-item').at(0));
expect(queryEntries.at(1).nodes.length).toBe(1);
expect(queryEntries.at(1).hasClass('selected')).toBeTruthy();
expect(queryEntries.at(1).getElements().length).toBe(1);
expect(queryEntries.at(1).render().hasClass('selected')).toBeTruthy();
});
});
describe('when arrow up is pressed', () => {
it('should select the most recent query', () => {
pressArrowUpKey(queryEntries.parent().at(0));
beforeEach(() => {
pressArrowUpKey(queryHistoryEntriesComponent.find('.list-item').at(0));
});
expect(queryEntries.at(0).nodes.length).toBe(1);
expect(queryEntries.at(0).hasClass('selected')).toBeTruthy();
it('should select the most recent query', () => {
expect(queryEntries.at(0).getElements().length).toBe(1);
expect(queryEntries.at(0).render().hasClass('selected')).toBeTruthy();
});
});
});
describe('when arrow up is pressed', () => {
beforeEach(() => {
pressArrowUpKey(queryHistoryEntriesComponent.find('.list-item').at(0));
});
it('should not change the selected query', () => {
pressArrowUpKey(queryEntries.parent().at(0));
expect(queryEntries.at(0).nodes.length).toBe(1);
expect(queryEntries.at(0).hasClass('selected')).toBeTruthy();
expect(queryEntries.at(0).getElements().length).toBe(1);
expect(queryEntries.at(0).render().hasClass('selected')).toBeTruthy();
});
});
});
@@ -173,6 +181,7 @@ describe('QueryHistory', () => {
beforeEach(() => {
copyAllButton = () => queryDetail.find('#history-detail-query > button');
});
it('displays the formatted timestamp', () => {
expect(queryDetail.at(0).text()).toContain('6-3-17 14:03:15Date');
});
@@ -243,7 +252,7 @@ describe('QueryHistory', () => {
});
it('should have the class \'was-copied\'', () => {
expect(copyAllButton().hasClass('was-copied')).toBe(true);
expect(copyAllButton().render().hasClass('was-copied')).toBe(true);
});
});
@@ -274,7 +283,7 @@ describe('QueryHistory', () => {
});
it('should have the class \'was-copied\'', () => {
expect(copyAllButton().hasClass('was-copied')).toBe(true);
expect(copyAllButton().render().hasClass('was-copied')).toBe(true);
});
});
@@ -319,14 +328,14 @@ describe('QueryHistory', () => {
});
it('deselects the first history entry', () => {
expect(firstEntry.nodes.length).toBe(1);
expect(firstEntry.getElements().length).toBe(1);
expect(firstEntry.hasClass('selected')).toBeFalsy();
});
it('selects the second history entry', () => {
expect(secondEntry.nodes.length).toBe(1);
expect(secondEntry.hasClass('selected')).toBeTruthy();
expect(secondEntry.getElements().length).toBe(1);
expect(secondEntry.render().hasClass('selected')).toBeTruthy();
});
});
@@ -342,7 +351,7 @@ describe('QueryHistory', () => {
let selectedListItem;
beforeEach(() => {
selectedListItem = ReactDOM.findDOMNode(historyWrapper.node)
selectedListItem = ReactDOM.findDOMNode(historyWrapper.instance())
.getElementsByClassName('selected')[0].parentElement;
spyOn(selectedListItem, 'focus');
@@ -355,7 +364,7 @@ describe('QueryHistory', () => {
});
it('the first query scrolls into view', () => {
historyWrapper.node.refocus();
historyWrapper.instance().refocus();
expect(selectedListItem.focus).toHaveBeenCalledTimes(0);
jasmine.clock().tick(1);
expect(selectedListItem.focus).toHaveBeenCalledTimes(1);
@@ -473,7 +482,7 @@ describe('QueryHistory', () => {
historyWrapper = mount(<QueryHistory historyCollection={historyCollection}/>);
const queryHistoryEntriesComponent = historyWrapper.find(QueryHistoryEntries);
isInvisibleSpy = spyOn(queryHistoryEntriesComponent.node, 'isInvisible')
isInvisibleSpy = spyOn(queryHistoryEntriesComponent.instance(), 'isInvisible')
.and.returnValue(false);
queryEntries = queryHistoryEntriesComponent.find(QueryHistoryEntry);