removed unnecessary factory classes, simplified existing services
This commit is contained in:
parent
2a59014f0b
commit
64a4b68216
15 changed files with 69 additions and 158 deletions
|
@ -2,17 +2,15 @@ import { RouteBuilderImpl } from './route-builder.service.impl';
|
|||
|
||||
|
||||
describe("Service: RouteBuilderImpl", () => {
|
||||
var routeProviderMock;
|
||||
var pagesMock;
|
||||
var profiles;
|
||||
var currentProfile;
|
||||
var routeProviderMock: any;
|
||||
var pagesMock: any;
|
||||
var profiles: any[];
|
||||
|
||||
beforeEach((() => {
|
||||
profiles = [
|
||||
{id: 'old-layout', templatePath: '/static/partials/'},
|
||||
{id: 'layout', templatePath: '/static/partials/'}
|
||||
];
|
||||
currentProfile = 'layout';
|
||||
routeProviderMock = jasmine.createSpyObj('routeProvider', ['otherwise', 'when']);
|
||||
pagesMock = jasmine.createSpyObj('pagesMock', ['get', 'create']);
|
||||
}));
|
||||
|
@ -20,29 +18,37 @@ describe("Service: RouteBuilderImpl", () => {
|
|||
describe("constructor", () => {
|
||||
|
||||
it("returns a RouteBuilder object", () => {
|
||||
var routeBuilder = new RouteBuilderImpl(routeProviderMock, pagesMock, profiles, currentProfile);
|
||||
var routeBuilder: RouteBuilderImpl = new RouteBuilderImpl(routeProviderMock, pagesMock);
|
||||
|
||||
expect(routeBuilder).toBeDefined();
|
||||
});
|
||||
|
||||
it("sets 'profiles' to all given profiles if given current profile does not match any of the given profiles' id", () => {
|
||||
var routeBuilder = new RouteBuilderImpl(routeProviderMock, pagesMock, profiles, 'fake-profile');
|
||||
it("initializes current profile to 'layout'", () => {
|
||||
var routeBuilder: RouteBuilderImpl = new RouteBuilderImpl(routeProviderMock, pagesMock);
|
||||
|
||||
expect(routeBuilder.profiles).toEqual(profiles);
|
||||
expect(routeBuilder.currentProfile).toEqual('layout');
|
||||
});
|
||||
|
||||
it("initializes available profiles", () => {
|
||||
var routeBuilder: RouteBuilderImpl = new RouteBuilderImpl(routeProviderMock, pagesMock);
|
||||
var matchingRoutes: any[] = routeBuilder.profiles.filter((profile) => {
|
||||
return profiles.indexOf(profile) == -1;
|
||||
});
|
||||
expect(matchingRoutes).toEqual(routeBuilder.profiles);
|
||||
});
|
||||
|
||||
it("sets 'profiles' to the first given profile with id matching given current profile", () => {
|
||||
var routeBuilder = new RouteBuilderImpl(routeProviderMock, pagesMock, profiles, currentProfile);
|
||||
var routeBuilder: RouteBuilderImpl = new RouteBuilderImpl(routeProviderMock, pagesMock);
|
||||
|
||||
expect(routeBuilder.profiles).toEqual([profiles[1]]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("otherwise", () => {
|
||||
var routeBuilder;
|
||||
var routeBuilder: RouteBuilderImpl;
|
||||
|
||||
beforeEach(() => {
|
||||
routeBuilder = new RouteBuilderImpl(routeProviderMock, pagesMock, profiles, currentProfile);
|
||||
routeBuilder = new RouteBuilderImpl(routeProviderMock, pagesMock);
|
||||
});
|
||||
|
||||
it("calls routeProvider to set fallback route with given options", () => {
|
||||
|
@ -54,10 +60,10 @@ describe("Service: RouteBuilderImpl", () => {
|
|||
});
|
||||
|
||||
describe("route", () => {
|
||||
var routeBuilder;
|
||||
var path;
|
||||
var pagename;
|
||||
var page;
|
||||
var routeBuilder: RouteBuilderImpl;
|
||||
var path: string;
|
||||
var pagename: string;
|
||||
var page: any;
|
||||
|
||||
beforeEach(() => {
|
||||
path = '/repository/:namespace/:name';
|
||||
|
@ -68,7 +74,7 @@ describe("Service: RouteBuilderImpl", () => {
|
|||
controller: jasmine.createSpy('pageController'),
|
||||
flags: {},
|
||||
};
|
||||
routeBuilder = new RouteBuilderImpl(routeProviderMock, pagesMock, profiles, currentProfile);
|
||||
routeBuilder = new RouteBuilderImpl(routeProviderMock, pagesMock);
|
||||
});
|
||||
|
||||
it("calls pages with given pagename and 'profiles' to get matching page and profile pair", () => {
|
||||
|
@ -91,7 +97,7 @@ describe("Service: RouteBuilderImpl", () => {
|
|||
|
||||
it("calls routeProvider to set route for given path and options", () => {
|
||||
pagesMock.get.and.returnValue([profiles[1], page]);
|
||||
var expectedOptions = {
|
||||
var expectedOptions: any = {
|
||||
templateUrl: profiles[1].templatePath + page.templateName,
|
||||
reloadOnSearch: false,
|
||||
controller: page.controller,
|
||||
|
|
Reference in a new issue