Skip to content

Davidkutu/ds interactive window focus fix #9895

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
David Kutugata (DavidKutu) merged 7 commits into from
Feb 4, 2020
Merged

Davidkutu/ds interactive window focus fix #9895

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
725a3ac
Fixed the focus on the interactive window
Jan 29, 2020
0c0673b
the new prop 'focusPending' needs to change in
Jan 30, 2020
d6690b7
added functional test
Jan 30, 2020
42bc79c
In test: force focus to buttons to take it away from
Jan 30, 2020
c2d3b0f
finished the functional test
Feb 3, 2020
4b9ff38
updated changelog
Feb 4, 2020
e125e89
deleted bug#.md
Feb 4, 2020
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
Prev Previous commit
Next Next commit
added functional test
  • Loading branch information
David Kutugata
David Kutugata committed Feb 4, 2020
commit d6690b7459789a2474ac5980b0ff999a291ee737
22 changes: 11 additions & 11 deletions src/test/datascience/dataScienceIocContainer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,17 +898,7 @@ export class DataScienceIocContainer extends UnitTestIocContainer {
}
}

private findPythonPath(): string {
try {
// Give preference to the CI test python (could also be set in launch.json for debugging).
const output = child_process.execFileSync(process.env.CI_PYTHON_PATH || 'python', ['-c', 'import sys;print(sys.executable)'], { encoding: 'utf8' });
return output.replace(/\r?\n/g, '');
} catch (ex) {
return 'python';
}
}

private postMessageToWebPanel(msg: any) {
public postMessageToWebPanel(msg: any) {
if (this.webPanelListener) {
this.webPanelListener.onMessage(msg.type, msg.payload);
} else {
Expand All @@ -923,6 +913,16 @@ export class DataScienceIocContainer extends UnitTestIocContainer {
}
}

private findPythonPath(): string {
try {
// Give preference to the CI test python (could also be set in launch.json for debugging).
const output = child_process.execFileSync(process.env.CI_PYTHON_PATH || 'python', ['-c', 'import sys;print(sys.executable)'], { encoding: 'utf8' });
return output.replace(/\r?\n/g, '');
} catch (ex) {
return 'python';
}
}

private mountReactControl(mount: () => ReactWrapper<any, Readonly<{}>, React.Component>) {
// This is a remount (or first time). Clear out messages that were sent
// by the last mount
Expand Down
23 changes: 22 additions & 1 deletion src/test/datascience/interactiveWindow.functional.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@ import { defaultDataScienceSettings } from './helpers';
import { addCode, getInteractiveCellResults, getOrCreateInteractiveWindow, runMountedTest } from './interactiveWindowTestHelpers';
import { MockDocumentManager } from './mockDocumentManager';
import { MockEditor } from './mockTextEditor';
import { waitForUpdate } from './reactHelpers';
import { createMessageEvent, waitForUpdate } from './reactHelpers';
import {
addContinuousMockData,
addInputMockData,
addMockData,
CellInputState,
CellPosition,
enterEditorKey,
enterInput,
escapePath,
findButton,
Expand Down Expand Up @@ -143,6 +144,26 @@ suite('DataScience Interactive Window output tests', () => {
}
);

runMountedTest(
'Ctrl + 1/Ctrl + 2',
async wrapper => {
await addCode(ioc, wrapper, 'a=1');

if (ioc) {
const message = createMessageEvent({ type: InteractiveWindowMessages.Activate });
ioc.postMessageToWebPanel(message);
}

enterEditorKey(wrapper, { code: 'a', editorInfo: undefined });
enterEditorKey(wrapper, { code: 'Enter', shiftKey: true, editorInfo: undefined });

verifyHtmlOnCell(wrapper, 'InteractiveCell', '<span>1</span>', CellPosition.First);
},
() => {
return ioc;
}
);

runMountedTest(
'Collapse / expand cell',
async wrapper => {
Expand Down