appveyor e2e

hansl · hansl · commit 90c19ef63f62 · 2016-09-07T19:44:31.000-07:00
diff --git a/addon/ng2/models/find-lazy-modules.ts b/addon/ng2/models/find-lazy-modules.ts
@@ -57,12 +57,15 @@ export function findLazyModules(projectRoot: any): string[] {
       findLoadChildren(tsPath).forEach(moduleName => {
         const fileName = path.resolve(path.dirname(tsPath), moduleName) + '.ts';
         if (fs.existsSync(fileName)) {
-          // Put the moduleName as relative to the main.ts.
+          // Convert the file path to a url.
           const posix = path.posix;
-          const normalizedPath = posix.normalize(tsPath);
-          const nomalizedModuleName = posix.normalize(moduleName);
-          const fullPath = posix.resolve(posix.dirname(normalizedPath), nomalizedModuleName);
-          const name = `./${posix.relative(projectRoot, fullPath)}.ts`;
+          const normalizedPath = tsPath.replace(/\\/g, posix.sep);
+          const normalizedModuleName = moduleName.replace(/\\/g, posix.sep);
+          const normalizedProjectRoot = projectRoot.replace(/\\/g, posix.sep);
+
+          // Put the moduleName as relative to the main.ts.
+          const fullPath = posix.resolve(posix.dirname(normalizedPath), normalizedModuleName);
+          const name = `./${posix.relative(normalizedProjectRoot, fullPath)}.ts`;
           result[name] = true;
         }
       });
diff --git a/tests/e2e/utils/git.ts b/tests/e2e/utils/git.ts
@@ -26,7 +26,6 @@ export function expectGitToBeClean() {
     });
 }
 
-
 export function gitCommit(message: string) {
   return git('add', '-A')
     .then(() => git('status', '--porcelain'))

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ export function expectGitToBeClean() {`
`26`	`26`	`});`
`27`	`27`	`}`
`28`	`28`
`29`		`-`
`30`	`29`	`export function gitCommit(message: string) {`
`31`	`30`	`return git('add', '-A')`
`32`	`31`	`.then(() => git('status', '--porcelain'))`