openstack/horizon
Code Issues Proposed changes

Merge "Delete container show duplicate toast notifications" into stable/2024.1

Browse Source
This commit is contained in:
Zuul 2024-11-19 14:33:05 +00:00 committed by Gerrit Code Review
commit a8b3b4621f
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openstack_dashboard/static/app/core/openstack-service-api/common-test.mock.js
View File

@ -87,7 +87,14 @@
var innerFunc = promise.catch.calls.argsFor(0)[0];
expect(innerFunc).toBeDefined();
spyOn(toastService, 'add');
innerFunc({status: 500});
var response = {status: 500};
if (angular.isDefined(config.throws) && config.throws) {
expect(function() {
innerFunc(response);
}).toThrow(response);
} else {
innerFunc(response);
}
expect(toastService.add).toHaveBeenCalledWith(config.messageType || 'error', config.error);
}
}

1
openstack_dashboard/static/app/core/openstack-service-api/swift.service.js
View File

@ -186,6 +186,7 @@
} else {
toastService.add('error', gettext('Unable to delete the container.'));
}
throw response;
});
}

8
openstack_dashboard/static/app/core/openstack-service-api/swift.service.spec.js
View File

@ -95,7 +95,8 @@
method: 'delete',
path: '/api/swift/containers/spam/metadata/',
error: 'Unable to delete the container.',
testInput: [ 'spam' ]
testInput: [ 'spam' ],
throws: true
},
{
func: 'setContainerAccess',
@ -205,7 +206,10 @@
var innerFunc = promise.catch.calls.argsFor(0)[0];
// In the case of 409
var message = 'Unable to delete the container because it is not empty.';
innerFunc({data: message, status: 409});
var response = {data: message, status: 409};
expect(function() {
innerFunc(response);
}).toThrow(response);
expect(toastService.add).toHaveBeenCalledWith('error', message);
}
);