Only specify use of html5 locationProvider if base tag

This fixes a bug introduced by the use of the locationProvider to assume
a base tag is present.  For Launch Instance (Angular) it may be present
on a page that doesn't use Angular routing (this is OK as the modals
don't currently use such routing).

To test the fix, you should make sure that you can open and see the
Launch Instance Wizard (Angular) without any JavaScript errors.

On the flip side, you should enable an Angular panel (e.g. Images)
and ensure that it loads without error.  To fully test routing, you'll
need to pull the patch: https://review.openstack.org/#/c/173885/

Change-Id: I021d8fdb2e96eefad03182d251445d0b8ab2fa28
Closes-Bug: 1536681
This commit is contained in:
Matt Borland 2016-01-21 08:38:50 -07:00 committed by Matt Borland
parent d4c7b8f813
commit 06a3b0da24
2 changed files with 44 additions and 17 deletions

View File

@ -79,13 +79,15 @@
*
*/
function configHorizon($locationProvider, $routeProvider) {
$locationProvider.html5Mode(true).hashPrefix('!');
if (angular.element('base').length === 1) {
$locationProvider.html5Mode(true).hashPrefix('!');
$routeProvider
.otherwise({
template: '',
controller: 'RedirectController'
});
$routeProvider
.otherwise({
template: '',
controller: 'RedirectController'
});
}
}
updateHorizon.$inject = [

View File

@ -40,23 +40,48 @@
module('locationProviderConfig');
module('horizon.app');
inject();
});
it('should set html5 mode', function() {
expect($locationProvider.html5Mode).toHaveBeenCalledWith(true);
describe('when base tag present', function() {
beforeEach(function() {
if (angular.element('base').length === 0) {
angular.element('html').append('<base>');
}
inject();
});
it('should set html5 mode', function() {
expect($locationProvider.html5Mode).toHaveBeenCalledWith(true);
});
it('should set hashPrefix', function() {
expect($locationProvider.hashPrefix).toHaveBeenCalledWith('!');
});
it('should set table and detail path', function() {
expect($routeProvider.otherwise.calls.count()).toEqual(1);
var otherwiseCallArgs = $routeProvider.otherwise.calls.argsFor(0);
expect(otherwiseCallArgs[0].controller).toEqual('RedirectController');
});
});
it('should set hashPrefix', function() {
expect($locationProvider.hashPrefix).toHaveBeenCalledWith('!');
describe('when base tag is not present', function() {
beforeEach(function() {
angular.element('base').remove();
inject();
});
it('should not set html5 mode', function() {
expect($locationProvider.html5Mode).not.toHaveBeenCalled();
});
it('should not set hashPrefix', function() {
expect($locationProvider.hashPrefix).not.toHaveBeenCalled();
});
});
it('should set table and detail path', function() {
expect($routeProvider.otherwise.calls.count()).toEqual(1);
var otherwiseCallArgs = $routeProvider.otherwise.calls.argsFor(0);
expect(otherwiseCallArgs[0].controller).toEqual('RedirectController');
});
});
})();