Skip to content

Cherry pick commits from master into April release #11138

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
Don Jayamanne (DonJayamanne) merged 9 commits into from
Apr 14, 2020
Merged

Cherry pick commits from master into April release #11138

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c7379ec
Load widget scripts from CDN and/or local python interpreter (#10987)
DonJayamanne Apr 10, 2020
f75b565
Copy widget scripts to extension folder (#11082)
DonJayamanne Apr 10, 2020
9de4543
Remove aml scripts from extension (#11085)
DonJayamanne Apr 10, 2020
066d5e6
Validate python when nb opened not on extension activates (#11087)
DonJayamanne Apr 10, 2020
0adb0a0
Support workspace images in markdown cells (#11086)
DonJayamanne Apr 10, 2020
437d62d
Fix functional tests for ipywidgets and download just chrome b… (#11093)
DonJayamanne Apr 11, 2020
37bb348
Added tests for k3d widget (#11133)
DonJayamanne Apr 13, 2020
41d2d87
Fix failing ipywidget tests (#11132)
DonJayamanne Apr 13, 2020
e437282
Update change log
DonJayamanne Apr 13, 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
Fix failing ipywidget tests (#11132) 
For #11099
  • Loading branch information
@DonJayamanne
DonJayamanne committed Apr 13, 2020
commit 41d2d8738d9e8c9f4aba3953d4fa067f3ad3b5ae
18 changes: 9 additions & 9 deletions src/test/datascience/ipywidgets/localWidgetScriptSourceProvider.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ suite('Data Science - ipywidget - Local Widget Script Source', () => {
metadata: { interpreter: { sysPrefix, path: 'pythonPath' } }
} as any);
when(fs.search(anything(), anything())).thenResolve([
'widget1/index.js',
'widget2/index.js',
'widget3/index.js'
path.join('widget1', 'index.js'),
path.join('widget2', 'index.js'),
path.join('widget3', 'index.js')
]);

const value = await scriptSourceProvider.getWidgetScriptSource('widget2', '1');
Expand All @@ -138,9 +138,9 @@ suite('Data Science - ipywidget - Local Widget Script Source', () => {
metadata: { interpreter: { sysPrefix, path: 'pythonPath' } }
} as any);
when(fs.search(anything(), anything())).thenResolve([
'widget1/index.js',
'widget2/index.js',
'widget3/index.js'
path.join('widget1', 'index.js'),
path.join('widget2', 'index.js'),
path.join('widget3', 'index.js')
]);

const value = await scriptSourceProvider.getWidgetScriptSource('widget1', '1');
Expand All @@ -162,9 +162,9 @@ suite('Data Science - ipywidget - Local Widget Script Source', () => {
metadata: { interpreter: { sysPrefix, path: 'pythonPath' } }
} as any);
when(fs.search(anything(), anything())).thenResolve([
'widget1/index.js',
'widget2/index.js',
'widget3/index.js'
path.join('widget1', 'index.js'),
path.join('widget2', 'index.js'),
path.join('widget3', 'index.js')
]);

const value = await scriptSourceProvider.getWidgetScriptSource('widgetNotFound', '1');
Expand Down