diff --git a/platform/representation/src/TemplatePrefetcher.js b/platform/representation/src/TemplatePrefetcher.js index 38fe4ebae2..5523bb54f0 100644 --- a/platform/representation/src/TemplatePrefetcher.js +++ b/platform/representation/src/TemplatePrefetcher.js @@ -25,10 +25,6 @@ define( function () { 'use strict'; - function concat(a, b) { - return a.concat(b); - } - /** * Loads all templates when the application is started. * @param {platform/representation.TemplateLinker} templateLinker @@ -39,9 +35,15 @@ define( */ function TemplatePrefetcher(templateLinker, extensions) { Array.prototype.slice.apply(arguments, [1]) - .reduce(concat, []) - .map(templateLinker.getPath.bind(templateLinker)) - .forEach(templateLinker.load.bind(templateLinker)); + .reduce(function (a, b) { + return a.concat(b); + }, []) + .map(function (ext) { + return templateLinker.getPath(ext); + }) + .forEach(function (path) { + templateLinker.load(path); + }); } return TemplatePrefetcher; diff --git a/platform/representation/test/TemplatePrefetcherSpec.js b/platform/representation/test/TemplatePrefetcherSpec.js new file mode 100644 index 0000000000..269f6cc0da --- /dev/null +++ b/platform/representation/test/TemplatePrefetcherSpec.js @@ -0,0 +1,76 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + + +define( + ["../src/TemplatePrefetcher"], + function (TemplatePrefetcher) { + 'use strict'; + + describe("TemplatePrefetcher", function () { + var mockTemplateLinker, + testExtensions, + testPathPrefix, + prefetcher; + + beforeEach(function () { + testPathPrefix = "some/path/"; + + mockTemplateLinker = jasmine.createSpyObj( + 'templateLinker', + [ 'getPath', 'load' ] + ); + + mockTemplateLinker.getPath.andCallFake(function (ext) { + return testPathPrefix + ext.templateUrl; + }); + + testExtensions = ['a', 'b', 'c'].map(function (category) { + return ['x', 'y', 'z'].map(function (ext) { + return { + templateUrl: category + '/' + ext + '.html' + }; + }); + }); + + prefetcher = new TemplatePrefetcher( + mockTemplateLinker, + testExtensions[0], + testExtensions[1], + testExtensions[2] + ); + }); + + it("loads all templates when run", function () { + testExtensions.forEach(function (category) { + category.forEach(function (extension) { + expect(mockTemplateLinker.load).toHaveBeenCalledWith( + mockTemplateLinker.getPath(extension) + ); + }); + }); + }); + + }); + } +); diff --git a/platform/representation/test/suite.json b/platform/representation/test/suite.json index d8ab95219a..54f7907da3 100644 --- a/platform/representation/test/suite.json +++ b/platform/representation/test/suite.json @@ -8,5 +8,6 @@ "services/DndService", "MCTInclude", "MCTRepresentation", - "TemplateLinker" + "TemplateLinker", + "TemplatePrefetcher" ]