Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ function WebsocketEventFactory($rootScope, $websocket, $location, baseUrlSrv, sa
} else if (op === 'PARAS_INFO') {
$rootScope.$broadcast('updateParaInfos', data);
} else if (op === 'CONVERTED_NOTE_NBFORMAT') {
saveAsService.saveAs(data.nbformat, data.noteName, '.ipynb');
saveAsService.saveAs(data.nbformat, data.noteName, 'ipynb');
} else if (op === 'INTERPRETER_INSTALL_STARTED') {
ngToast.info(data.message);
} else if (op === 'INTERPRETER_INSTALL_RESULT') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ describe('Factory: websocketEvents', function() {
let messageCallback;
let ngToast;
let rootScope;
let saveAsService;
let websocketEvents;

beforeEach(function() {
Expand All @@ -34,6 +35,7 @@ describe('Factory: websocketEvents', function() {
socket: {readyState: 1},
};
ngToast = {info: jasmine.createSpy('info')};
saveAsService = {saveAs: jasmine.createSpy('saveAs')};

angular.mock.module('zeppelinWebApp', function($provide) {
$provide.value('$websocket', function() {
Expand All @@ -42,7 +44,7 @@ describe('Factory: websocketEvents', function() {
$provide.value('baseUrlSrv', {getWebsocketUrl: function() {
return 'ws://localhost/ws';
}});
$provide.value('saveAsService', {saveAs: angular.noop});
$provide.value('saveAsService', saveAsService);
$provide.value('ngToast', ngToast);
});
});
Expand Down Expand Up @@ -91,4 +93,18 @@ describe('Factory: websocketEvents', function() {
expect(console.log).toHaveBeenCalledWith('Receive << %o', 'NOTICE');
expect(JSON.stringify(console.log.calls.allArgs())).not.toContain(payloadSecret);
});

it('passes the ipynb extension without a leading dot when saving a converted note', function() {
const nbformat = '{"cells": []}';

messageCallback({
data: JSON.stringify({
op: 'CONVERTED_NOTE_NBFORMAT',
data: {nbformat: nbformat, noteName: 'test sh'},
}),
});

// saveAsService.saveAs() joins the file name and the extension with a dot itself
expect(saveAsService.saveAs).toHaveBeenCalledWith(nbformat, 'test sh', 'ipynb');
});
});
Loading