Add tests

Author: vakrilov

Diff for: nativescript-angular/file-system/ns-file-system.ts

@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { knownFolders, Folder } from "tns-core-modules/file-system";
+import { knownFolders, Folder, File } from "tns-core-modules/file-system";
 
 // Allows greater flexibility with `file-system` and Angular
 // Also provides a way for `file-system` to be mocked for testing
@@ -9,4 +9,12 @@ export class NSFileSystem {
   public currentApp(): Folder {
     return knownFolders.currentApp();
   }
+
+  public fileFromPath(path: string): File {
+    return File.fromPath(path);
+  }
+
+  public fileExists(path: string): boolean {
+    return File.exists(path);
+  }
 }

Diff for: nativescript-angular/platform.ts

@@ -35,6 +35,7 @@ if ((<any>global).___TS_UNUSED) {
 import "./dom-adapter";
 
 import { NativeScriptElementSchemaRegistry } from "./schema-registry";
+import { NSFileSystem } from "./file-system/ns-file-system";
 import { FileSystemResourceLoader } from "./resource-loader";
 
 export const NS_COMPILER_PROVIDERS = [
@@ -43,6 +44,7 @@ export const NS_COMPILER_PROVIDERS = [
         provide: COMPILER_OPTIONS,
         useValue: {
             providers: [
+                NSFileSystem,
                 { provide: ResourceLoader, useClass: FileSystemResourceLoader },
                 { provide: ElementSchemaRegistry, useClass: NativeScriptElementSchemaRegistry },
             ]

Diff for: nativescript-angular/resource-loader.ts

@@ -1,35 +1,43 @@
+import { Injectable } from "@angular/core";
 import { ResourceLoader } from "@angular/compiler";
-import { File, knownFolders, path } from "tns-core-modules/file-system";
+import { path } from "tns-core-modules/file-system";
+
+import { NSFileSystem } from "./file-system/ns-file-system";
 
 const extensionsFallbacks = [
     [".scss", ".css"],
     [".sass", ".css"],
     [".less", ".css"]
 ];
 
+@Injectable()
 export class FileSystemResourceLoader extends ResourceLoader {
+    constructor(private fs: NSFileSystem) {
+        super();
+    }
+
     get(url: string): Promise<string> {
         const resolvedPath = this.resolve(url);
 
-        const templateFile = File.fromPath(resolvedPath);
+        const templateFile = this.fs.fileFromPath(resolvedPath);
 
         return templateFile.readText();
     }
 
-    private handleAbsoluteUrls(url: string): string {
+    resolveRelativeUrls(url: string): string {
         // Angular assembles absolute URLs and prefixes them with //
         if (url.indexOf("/") !== 0) {
             // Resolve relative URLs based on the app root.
-            return path.join(knownFolders.currentApp().path, url);
+            return path.join(this.fs.currentApp().path, url);
         } else {
             return url;
         }
     }
 
-    private resolve(url: string) {
-        const normalizedUrl = this.handleAbsoluteUrls(url);
+    resolve(url: string) {
+        const normalizedUrl = this.resolveRelativeUrls(url);
 
-        if (File.exists(normalizedUrl)) {
+        if (this.fs.fileExists(normalizedUrl)) {
             return normalizedUrl;
         }
 
@@ -41,7 +49,7 @@ export class FileSystemResourceLoader extends ResourceLoader {
         });
 
         for (let i = 0; i < fallbackCandidates.length; i++) {
-            if (File.exists(fallbackCandidates[i])) {
+            if (this.fs.fileExists(fallbackCandidates[i])) {
                 return fallbackCandidates[i];
             }
         }

Diff for: tests/app/tests/ns-location-strategy.ts

@@ -19,7 +19,7 @@ class FakeFrame extends View implements Frame {
         }
     }
 
-    navigate(entry: NavigationEntry) { }
+    navigate(entry: any) { }
 
     constructor(private backCB?: () => void) {
         super();

Diff for: tests/app/tests/xhr-paths.ts

@@ -1,22 +1,68 @@
 // make sure you import mocha-config before @angular/core
-import {assert} from "./test-config";
-import {FileSystemResourceLoader} from "nativescript-angular/resource-loader";
+import { assert } from "./test-config";
+import { FileSystemResourceLoader } from "nativescript-angular/resource-loader";
+
+import { File } from "tns-core-modules/file-system";
+import { NSFileSystem } from "nativescript-angular/file-system/ns-file-system";
+
+class NSFileSystemMock {
+    public currentApp(): any {
+        return { path: "/app/dir" };
+    }
+
+    public fileFromPath(path: string): File {
+        return null;
+    }
+
+    public fileExists(path: string): boolean {
+        // mycomponent.html aways exists
+        // mycomponent.css is the other file
+        return path.indexOf("mycomponent.html") >= 0 || path === "/app/dir/mycomponent.css";
+    }
+}
+const fsMock = new NSFileSystemMock();
 
 describe("XHR name resolution", () => {
+    let resourceLoader: FileSystemResourceLoader;
+    before(() => {
+        resourceLoader = new FileSystemResourceLoader(new NSFileSystemMock());
+    });
+
     it("resolves relative paths from app root", () => {
-        const xhr = new FileSystemResourceLoader();
-        assert.strictEqual("/app/dir/mydir/mycomponent.html", xhr.resolve("mydir/mycomponent.html", "/app/dir"));
+        assert.strictEqual("/app/dir/mydir/mycomponent.html", resourceLoader.resolve("mydir/mycomponent.html"));
     });
 
     it("resolves double-slashed absolute paths as is", () => {
-        const xhr = new FileSystemResourceLoader();
-        assert.strictEqual("//app/mydir/mycomponent.html", xhr.resolve("//app/mydir/mycomponent.html", "/app/dir"));
+        assert.strictEqual("//app/mydir/mycomponent.html", resourceLoader.resolve("//app/mydir/mycomponent.html"));
     });
 
     it("resolves single-slashed absolute paths as is", () => {
-        const xhr = new FileSystemResourceLoader();
         assert.strictEqual(
             "/data/data/app/mydir/mycomponent.html",
-            xhr.resolve("/data/data/app/mydir/mycomponent.html", "/app/dir"));
+            resourceLoader.resolve("/data/data/app/mydir/mycomponent.html"));
+    });
+
+    it("resolves existing CSS file", () => {
+        assert.strictEqual(
+            "/app/dir/mycomponent.css",
+            resourceLoader.resolve("mycomponent.css"));
+    });
+
+    it("resolves non-existing .scss file to existing .css file", () => {
+        assert.strictEqual(
+            "/app/dir/mycomponent.css",
+            resourceLoader.resolve("mycomponent.scss"));
+    });
+
+    it("resolves non-existing .sass file to existing .css file", () => {
+        assert.strictEqual(
+            "/app/dir/mycomponent.css",
+            resourceLoader.resolve("mycomponent.sass"));
+    });
+
+    it("resolves non-existing .less file to existing .css file", () => {
+        assert.strictEqual(
+            "/app/dir/mycomponent.css",
+            resourceLoader.resolve("mycomponent.less"));
     });
 });