Merge "Fix key import in angular Launch Instance" into stable/mitaka
This commit is contained in:
commit
0b35ce5374
@ -49,10 +49,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function successCallback(data) {
|
function successCallback(data) {
|
||||||
$modalInstance.close(data);
|
$modalInstance.close(data.data);
|
||||||
|
|
||||||
var successMsg = gettext('Successfully imported key pair %(name)s.');
|
var successMsg = gettext('Successfully imported key pair %(name)s.');
|
||||||
toastService.add('success', interpolate(successMsg, { name: data.name }, true));
|
toastService.add('success', interpolate(successMsg, { name: data.data.name }, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
function cancel() {
|
function cancel() {
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
describe('Launch Instance Import Key Pair Controller', function() {
|
describe('Launch Instance Import Key Pair Controller', function() {
|
||||||
|
|
||||||
var novaAPI, ctrl, toastService, $q, $rootScope;
|
var novaAPI, ctrl, toastService, $q, $rootScope;
|
||||||
var model = { name: 'newKeypair', public_key: '' };
|
var data = { data: { name: 'newKeypair', public_key: '' } };
|
||||||
var modalInstanceMock = {
|
var modalInstanceMock = {
|
||||||
close: angular.noop,
|
close: angular.noop,
|
||||||
dismiss: angular.noop
|
dismiss: angular.noop
|
||||||
@ -58,7 +58,7 @@
|
|||||||
|
|
||||||
ctrl.submit();
|
ctrl.submit();
|
||||||
|
|
||||||
deferredSuccess.resolve(model);
|
deferredSuccess.resolve(data);
|
||||||
$rootScope.$apply();
|
$rootScope.$apply();
|
||||||
|
|
||||||
expect(novaAPI.createKeypair).toHaveBeenCalled();
|
expect(novaAPI.createKeypair).toHaveBeenCalled();
|
||||||
|
Loading…
Reference in New Issue
Block a user