Skip to content

Fix widget tests #11406

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 1 commit into from
Apr 27, 2020
Merged

Fix widget tests #11406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions src/client/datascience/ipywidgets/localWidgetScriptSourceProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,28 @@ export class LocalWidgetScriptSourceProvider implements IWidgetScriptSourceProvi

const validFiles = files.filter((file) => {
// Should be of the form `<widget module>/index.js`
const parts = file.split('/'); // On windows this uses the unix separator too.
let parts = file.split('/'); // On windows this uses the unix separator too.
if (parts.length === 1) {
// Fall back if search API changes and returns results with OS path sep.
parts = file.split('\\');
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically future proofing the code.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should port this change into master then.

}
if (parts.length !== 2) {
traceError('Incorrect file found when searching for nnbextension entrypoints');
traceError(`Incorrect file found when searching for nnbextension entrypoints ${file}`);
return false;
}
return true;
});

const mappedFiles = validFiles.map(async (file) => {
// Should be of the form `<widget module>/index.js`
const parts = file.split('/');
let parts = file.split('/'); // On windows this uses the unix separator too.
if (parts.length === 1) {
// Fall back if search API changes and returns results with OS path sep.
parts = file.split('\\');
}
const moduleName = parts[0];

const fileUri = Uri.file(path.join(nbextensionsPath, file));
const fileUri = Uri.file(path.join(nbextensionsPath, moduleName, parts[1]));
const scriptUri = (await this.localResourceUriConverter.asWebviewUri(fileUri)).toString();
// tslint:disable-next-line: no-unnecessary-local-variable
const widgetScriptSource: WidgetScriptSource = { moduleName, scriptUri, source: 'local' };
Expand Down
2 changes: 1 addition & 1 deletion src/test/datascience/ipywidgets/ipyWidgetScriptSourceProvider.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { InterpreterService } from '../../../client/interpreter/interpreterServi

// tslint:disable: no-any no-invalid-this

suite('xxxData Science - ipywidget - Widget Script Source Provider', () => {
suite('Data Science - ipywidget - Widget Script Source Provider', () => {
let scriptSourceProvider: IPyWidgetScriptSourceProvider;
let notebook: INotebook;
let configService: IConfigurationService;
Expand Down