Merge pull request #642 from nasa/open460

[Build] Move to npm-based build

platform/representation/test/MCTIncludeSpec.js

@@ -91,12 +91,12 @@ define(
                 mockScope.key = 'abc';
                 fireWatch('key', mockScope.key);
                 expect(mockChangeTemplate)
-                    .toHaveBeenCalledWith(testUrls.abc);
+                    .toHaveBeenCalledWith(testTemplates[0]);
 
                 mockScope.key = 'xyz';
                 fireWatch('key', mockScope.key);
                 expect(mockChangeTemplate)
-                    .toHaveBeenCalledWith(testUrls.xyz);
+                    .toHaveBeenCalledWith(testTemplates[1]);
             });
 
         });

platform/representation/test/MCTRepresentationSpec.js

@@ -174,7 +174,7 @@ define(
                 fireWatch('domainObject', mockDomainObject);
 
                 expect(mockChangeTemplate)
-                    .toHaveBeenCalledWith(testUrls.abc);
+                    .toHaveBeenCalledWith(testRepresentations[0]);
             });
 
             it("recognizes keys for views", function () {
@@ -186,7 +186,7 @@ define(
                 fireWatch('domainObject', mockDomainObject);
 
                 expect(mockChangeTemplate)
-                    .toHaveBeenCalledWith(testUrls.xyz);
+                    .toHaveBeenCalledWith(testViews[1]);
             });
 
             it("does not load templates until there is an object", function () {
@@ -196,13 +196,13 @@ define(
                 fireWatch('key', mockScope.key);
 
                 expect(mockChangeTemplate)
-                    .not.toHaveBeenCalledWith(jasmine.any(String));
+                    .not.toHaveBeenCalledWith(jasmine.any(Object));
 
                 mockScope.domainObject = mockDomainObject;
                 fireWatch('domainObject', mockDomainObject);
 
                 expect(mockChangeTemplate)
-                    .toHaveBeenCalledWith(jasmine.any(String));
+                    .toHaveBeenCalledWith(jasmine.any(Object));
             });
 
             it("loads declared capabilities", function () {

platform/representation/test/TemplateLinkerSpec.js

@@ -44,6 +44,16 @@ define(
                 mockPromise,
                 linker;
 
+            function testExtension(path, res, templatePath) {
+                return {
+                    bundle: {
+                        path: path,
+                        resources: res
+                    },
+                    templateUrl: templatePath
+                };
+            }
+
             beforeEach(function () {
                 mockTemplateRequest = jasmine.createSpy('$templateRequest');
                 mockSce = jasmine.createSpyObj('$sce', ['trustAsResourceUrl']);
@@ -91,13 +101,8 @@ define(
             });
 
             it("resolves extension paths", function () {
-                expect(linker.getPath({
-                    bundle: {
-                        path: 'a',
-                        resources: 'b'
-                    },
-                    templateUrl: 'c/d.html'
-                })).toEqual('a/b/c/d.html');
+                var testExt = testExtension('a', 'b', 'c/d.html');
+                expect(linker.getPath(testExt)).toEqual('a/b/c/d.html');
             });
 
             describe("when linking elements", function () {
@@ -132,13 +137,15 @@ define(
                 });
 
                 describe("and then changing templates", function () {
-                    var testUrl,
+                    var testExt,
+                        testUrl,
                         testTemplate;
 
                     beforeEach(function () {
-                        testUrl = "some/url/template.html";
+                        testExt = testExtension('some', 'url', 'template.html');
+                        testUrl = linker.getPath(testExt);
                         testTemplate = "<div>Some template!</div>";
-                        changeTemplate(testUrl);
+                        changeTemplate(testExt);
                         mockPromise.then.mostRecentCall
                             .args[0](testTemplate);
                     });
@@ -182,7 +189,9 @@ define(
 
                     describe("which cannot be found", function () {
                         beforeEach(function () {
-                            changeTemplate("some/bad/url");
+                            changeTemplate(
+                                testExtension("some", "bad", "template.html")
+                            );
                             // Reject the template promise
                             mockPromise.then.mostRecentCall.args[1]();
                         });
@@ -206,11 +215,13 @@ define(
             });
 
             describe("when an initial template URL is provided", function () {
-                var testUrl;
+                var testExt,
+                    testUrl;
 
                 beforeEach(function () {
-                    testUrl = "some/test/url.html";
-                    linker.link(mockScope, mockElement, testUrl);
+                    testExt = testExtension('some', 'test', 'template.html');
+                    testUrl = linker.getPath(testExt);
+                    linker.link(mockScope, mockElement, testExt);
                 });
 
                 it("does not remove the element initially", function () {