diff --git a/test/UnitTestSuite.js b/test/UnitTestSuite.js
index 38193868f..5d83dc70a 100644
--- a/test/UnitTestSuite.js
+++ b/test/UnitTestSuite.js
@@ -21,6 +21,7 @@
define(function (require, exports, module) {
+ require("spec/Tauri-platform-test");
require("spec/utframework-suite-test");
require("spec/Async-test");
require("spec/CommandManager-test");
diff --git a/test/spec/ExtensionInstallation-test.js b/test/spec/ExtensionInstallation-test.js
index 44545d3cd..2947949a9 100644
--- a/test/spec/ExtensionInstallation-test.js
+++ b/test/spec/ExtensionInstallation-test.js
@@ -19,24 +19,26 @@
*
*/
-/*global describe, it, expect, beforeAll, afterAll, beforeEach, afterEach, awaitsFor, awaitsForDone, jsPromise */
+/*global describe, it, expect, beforeAll, afterAll, beforeEach, afterEach, awaitsFor, awaitsForDone, jsPromise, Phoenix*/
define(function (require, exports, module) {
- var SpecRunnerUtils = require("spec/SpecRunnerUtils"),
+ const SpecRunnerUtils = require("spec/SpecRunnerUtils"),
ExtensionLoader = require("utils/ExtensionLoader"),
FileSystem = require("filesystem/FileSystem"),
Package = require("extensibility/Package");
- var testFilePath = SpecRunnerUtils.getTestPath("/spec/extension-test-files");
+ const testFilePath = SpecRunnerUtils.getTestPath("/spec/extension-test-files");
- var tempDirectory = SpecRunnerUtils.getTempDirectory();
- var extensionsRoot = tempDirectory + "/extensions";
+ const tempDirectory = window.__TAURI__ ? Phoenix.VFS.getTauriAssetServeDir() + "tests": SpecRunnerUtils.getTempDirectory();
+ const extensionsRoot = tempDirectory + "/extensions";
- var basicValid = testFilePath + "/basic-valid-extension.zip",
- missingNameVersion = testFilePath + "/missing-name-version.zip",
- incompatibleVersion = testFilePath + "/incompatible-version.zip";
+ const basicValidSrc = testFilePath + "/basic-valid-extension.zip",
+ missingNameVersionSrc = testFilePath + "/missing-name-version.zip";
+
+ let basicValid = basicValidSrc, // this will differ for tauri, see before all
+ missingNameVersion = missingNameVersionSrc;
describe("Extension Installation", function () {
// The code that follows mocks out the bits of ExtensionLoader that are
@@ -58,11 +60,17 @@ define(function (require, exports, module) {
}
beforeAll(async function () {
- await SpecRunnerUtils.createTempDirectory();
+ await SpecRunnerUtils.ensureExistsDirAsync(tempDirectory);
+ if(window.__TAURI__){
+ basicValid = tempDirectory + "/basic-valid-extension.zip";
+ missingNameVersion = tempDirectory + "/missing-name-version.zip";
+ await SpecRunnerUtils.copy(basicValidSrc, basicValid);
+ await SpecRunnerUtils.copy(missingNameVersionSrc, missingNameVersion);
+ }
});
afterAll(async function () {
- await SpecRunnerUtils.removeTempDirectory();
+ await SpecRunnerUtils.deletePathAsync(tempDirectory, true);
});
beforeEach(function () {
@@ -83,11 +91,11 @@ define(function (require, exports, module) {
it("extensions should install and load", async function () {
let packageData = await jsPromise(Package.installFromURL(
- window.fsServerUrl + basicValid, extensionsRoot + "/custom").promise);
+ Phoenix.VFS.getVirtualServingURLForPath(basicValid), extensionsRoot + "/custom").promise);
expect(packageData.installationStatus).toEqual("INSTALLED");
expect(packageData.name).toEqual("basic-valid");
- expect(packageData.installedTo).toEqual("/test/temp/extensions/custom/basic-valid");
- expect(packageData.localPath).toEqual("/test/temp/extensions/custom/basic-valid");
+ expect(packageData.installedTo).toEqual(`${extensionsRoot}/custom/basic-valid`);
+ expect(packageData.localPath).toEqual(`${extensionsRoot}/custom/basic-valid`);
let extension = await jsPromise(Package.install(packageData.installedTo, packageData.name, false));
expect(extension.name).toEqual("basic");
@@ -95,11 +103,11 @@ define(function (require, exports, module) {
it("extensions should install and load to default location", async function () {
let packageData = await jsPromise(Package.installFromURL(
- window.fsServerUrl + basicValid).promise);
+ Phoenix.VFS.getVirtualServingURLForPath(basicValid)).promise);
expect(packageData.installationStatus).toEqual("INSTALLED");
expect(packageData.name).toEqual("basic-valid");
- expect(packageData.installedTo).toEqual("/test/temp/extensions/user/basic-valid");
- expect(packageData.localPath).toEqual("/test/temp/extensions/user/basic-valid");
+ expect(packageData.installedTo).toEqual(`${extensionsRoot}/user/basic-valid`);
+ expect(packageData.localPath).toEqual(`${extensionsRoot}/user/basic-valid`);
let extension = await jsPromise(Package.install(packageData.installedTo, packageData.name, false));
expect(extension.name).toEqual("basic");
@@ -107,11 +115,11 @@ define(function (require, exports, module) {
it("extensions should install and load with missing name and version", async function () {
let packageData = await jsPromise(Package.installFromURL(
- window.fsServerUrl + missingNameVersion).promise);
+ Phoenix.VFS.getVirtualServingURLForPath(missingNameVersion)).promise);
expect(packageData.installationStatus).toEqual("INSTALLED");
expect(packageData.name).toEqual("missing-name");
- expect(packageData.installedTo).toEqual("/test/temp/extensions/user/missing-name");
- expect(packageData.localPath).toEqual("/test/temp/extensions/user/missing-name");
+ expect(packageData.installedTo).toEqual(`${extensionsRoot}/user/missing-name`);
+ expect(packageData.localPath).toEqual(`${extensionsRoot}/user/missing-name`);
let extension = await jsPromise(Package.install(packageData.installedTo, packageData.name, false));
expect(extension.name).toEqual("missing");
@@ -119,11 +127,11 @@ define(function (require, exports, module) {
it("should remove an installed extension", async function () {
let packageData = await jsPromise(Package.installFromURL(
- window.fsServerUrl + basicValid).promise);
+ Phoenix.VFS.getVirtualServingURLForPath(basicValid)).promise);
expect(packageData.installationStatus).toEqual("INSTALLED");
expect(packageData.name).toEqual("basic-valid");
- expect(packageData.installedTo).toEqual("/test/temp/extensions/user/basic-valid");
- expect(packageData.localPath).toEqual("/test/temp/extensions/user/basic-valid");
+ expect(packageData.installedTo).toEqual(`${extensionsRoot}/user/basic-valid`);
+ expect(packageData.localPath).toEqual(`${extensionsRoot}/user/basic-valid`);
let extension = await jsPromise(Package.install(packageData.installedTo, packageData.name, false));
expect(extension.name).toEqual("basic");
diff --git a/test/spec/ExtensionLoader-test.js b/test/spec/ExtensionLoader-test.js
index ed8f1973d..0b06581e3 100644
--- a/test/spec/ExtensionLoader-test.js
+++ b/test/spec/ExtensionLoader-test.js
@@ -20,7 +20,8 @@
*/
/*jslint regexp: true */
-/*global describe, it, spyOn, expect, beforeEach, afterEach, awaitsForFail, awaitsForDone, awaitsFor */
+/*global describe, it, spyOn, expect, beforeAll, beforeEach, afterEach, afterAll, awaitsForFail, awaitsForDone,
+awaitsFor, Phoenix */
define(function (require, exports, module) {
@@ -30,7 +31,8 @@ define(function (require, exports, module) {
ThemeManager = require("view/ThemeManager"),
SpecRunnerUtils = require("spec/SpecRunnerUtils");
- const testPath = SpecRunnerUtils.getTestPath("/spec/ExtensionLoader-test-files");
+ const testPathSrc = SpecRunnerUtils.getTestPath("/spec/ExtensionLoader-test-files");
+ const testPath = window.__TAURI__ ? Phoenix.VFS.getTauriAssetServeDir() + "tests": SpecRunnerUtils.getTempDirectory();
describe("ExtensionLoader", function () {
@@ -39,7 +41,7 @@ define(function (require, exports, module) {
async function testLoadExtension(name, promiseState, error) {
var promise,
config = {
- baseUrl: window.fsServerUrl + testPath + "/" + name
+ baseUrl: Phoenix.VFS.getVirtualServingURLForPath(testPath + "/" + name)
},
consoleErrors = [];
@@ -73,6 +75,15 @@ define(function (require, exports, module) {
expect(promise.state()).toBe(promiseState);
}
+ beforeAll(async function () {
+ await SpecRunnerUtils.deletePathAsync(testPath, true);
+ await SpecRunnerUtils.copy(testPathSrc, testPath);
+ });
+
+ afterAll(async function () {
+ await SpecRunnerUtils.deletePathAsync(testPath, true);
+ });
+
beforeEach(function () {
origTimeout = ExtensionLoader._getInitExtensionTimeout();
ExtensionLoader._setInitExtensionTimeout(500);
@@ -116,7 +127,7 @@ define(function (require, exports, module) {
it("should log an error if an extension init fails with a runtime error", async function () {
let errorMsg = "[Extension] Error -- error thrown during initExtension for InitRuntimeError: ReferenceError: isNotDefined is not defined";
- if(window.Phoenix.browser.desktop.isSafari || window.Phoenix.browser.mobile.isIos){
+ if(window.Phoenix.browser.desktop.isSafari || window.Phoenix.browser.desktop.isWebKit || window.Phoenix.browser.mobile.isIos){
errorMsg = "[Extension] Error -- error thrown during initExtension for InitRuntimeError: ReferenceError: Can't find variable: isNotDefined";
}
await testLoadExtension("InitRuntimeError", "rejected", errorMsg);
diff --git a/test/spec/ExtensionManager-test.js b/test/spec/ExtensionManager-test.js
index 486bb6807..661dc5966 100644
--- a/test/spec/ExtensionManager-test.js
+++ b/test/spec/ExtensionManager-test.js
@@ -20,7 +20,8 @@
*/
/*jslint regexp: true */
-/*global describe, it, expect, beforeEach, afterEach, spyOn, jasmine, awaitsFor, awaitsForDone */
+/*global describe, it, expect, beforeAll, afterAll, beforeEach, afterEach, spyOn,
+ jasmine, awaitsFor, awaitsForDone, Phoenix */
/*unittests: ExtensionManager*/
define(function (require, exports, module) {
@@ -31,21 +32,16 @@ define(function (require, exports, module) {
var _ = require("thirdparty/lodash");
var ExtensionManager = require("extensibility/ExtensionManager"),
- ExtensionManagerView = require("extensibility/ExtensionManagerView").ExtensionManagerView,
ExtensionManagerViewModel = require("extensibility/ExtensionManagerViewModel"),
ExtensionManagerDialog = require("extensibility/ExtensionManagerDialog"),
InstallExtensionDialog = require("extensibility/InstallExtensionDialog"),
Package = require("extensibility/Package"),
ExtensionLoader = require("utils/ExtensionLoader"),
SpecRunnerUtils = require("spec/SpecRunnerUtils"),
- NativeApp = require("utils/NativeApp"),
Dialogs = require("widgets/Dialogs"),
CommandManager = require("command/CommandManager"),
Commands = require("command/Commands"),
FileSystem = require("filesystem/FileSystem"),
- Strings = require("strings"),
- StringUtils = require("utils/StringUtils"),
- LocalizationUtils = require("utils/LocalizationUtils"),
PreferencesManager = require("preferences/PreferencesManager"),
mockRegistryText = require("text!spec/ExtensionManager-test-files/mockRegistry.json"),
mockRegistryThemesText = require("text!spec/ExtensionManager-test-files/mockRegistryThemes.json"),
@@ -53,9 +49,22 @@ define(function (require, exports, module) {
mockExtensionList = require("text!spec/ExtensionManager-test-files/mockExtensionList.json"),
mockRegistry;
+ const testPath = window.__TAURI__ ?
+ Phoenix.VFS.getTauriAssetServeDir() + "tests" :
+ SpecRunnerUtils.getTempDirectory();
+ const testSrc = SpecRunnerUtils.getTestPath("/spec/ExtensionManager-test-files");
+
describe("ExtensionManager", function () {
- var mockId, mockSettings, origRegistryURL, origExtensionUrl, removedPath,
- view, model, fakeLoadDeferred, modelDisposed, disabledFilePath;
+ var mockId, mockSettings, origRegistryURL, origExtensionUrl, removedPath, disabledFilePath;
+
+ beforeAll(async function () {
+ await SpecRunnerUtils.deletePathAsync(testPath, true);
+ await SpecRunnerUtils.copy(testSrc, testPath);
+ });
+
+ afterAll(async function () {
+ await SpecRunnerUtils.deletePathAsync(testPath, true);
+ });
beforeEach(function () {
// Use fake URLs for the registry (useful if the registry isn't actually currently
@@ -80,9 +89,8 @@ define(function (require, exports, module) {
mockId = $.mockjax(mockSettings);
// Set a fake path for user extensions.
- var mockPath = SpecRunnerUtils.getTestPath("/spec/ExtensionManager-test-files");
spyOn(ExtensionLoader, "getUserExtensionPath").and.callFake(function () {
- return mockPath + "/user";
+ return testPath + "/user";
});
// Fake package removal.
@@ -124,32 +132,20 @@ define(function (require, exports, module) {
ExtensionManager.on("statusChange.mock-load", function () {
numStatusChanges++;
});
- var mockPath = window.fsServerUrl + SpecRunnerUtils.getTestPath("/spec/ExtensionManager-test-files");
+ var mockPath = Phoenix.VFS.getVirtualServingURLForPath(testPath);
names = names || ["default/mock-extension-1", "dev/mock-extension-2", "user/mock-legacy-extension"];
names.forEach(function (name) {
ExtensionLoader.trigger(shouldFail ? "loadFailed" : (shouldDisable ? "disabled" : "load"), mockPath + "/" + name);
});
// Make sure the ExtensionManager has finished reading all the package.jsons before continuing.
- await awaitsFor(function () { return numStatusChanges === names.length; }, "ExtensionManager status changes");
+ await awaitsFor(function () { return numStatusChanges === names.length; },
+ "ExtensionManager status changes",
+ 10000);
ExtensionManager.off(".mock-load");
}
- function makeMockInstalledVersion(mockRegistryExtension, installedVersion) {
- var ref = _.find(mockRegistryExtension.versions, { version: installedVersion });
- return {
- locationType: ExtensionManager.LOCATION_USER,
- metadata: {
- name: mockRegistryExtension.metadata.name,
- title: mockRegistryExtension.metadata.title,
- version: ref.version,
- engines: { brackets: ref.brackets }
- },
- owner: mockRegistryExtension.owner
- };
- }
-
function makeMockExtension(versionRequirements) {
var FAKE_DATE = "2013-04-10T18:28:20.530Z",
versions = [];
@@ -169,49 +165,6 @@ define(function (require, exports, module) {
};
}
- function setupExtensionManagerViewTests(context) {
- jasmine.addMatchers({
- toHaveText: function (expected) {
- var notText = this.isNot ? " not" : "";
- this.message = function () {
- return "Expected view" + notText + " to contain text " + expected;
- };
- return SpecRunnerUtils.findDOMText(this.actual.$el, expected);
- },
- toHaveLink: function (expected) {
- var notText = this.isNot ? " not" : "";
- this.message = function () {
- return "Expected view" + notText + " to contain link " + expected;
- };
- return SpecRunnerUtils.findDOMText(this.actual.$el, expected, true);
- }
- });
- spyOn(InstallExtensionDialog, "installUsingDialog").and.callFake(async function (url) {
- var id = url.match(/fake-repository\.com\/([^\/]+)/)[1];
- await mockLoadExtensions(["user/" + id]);
- });
- }
-
- function cleanupExtensionManagerViewTests() {
- if (view) {
- view.$el.remove();
- view = null;
- }
- if (model) {
- model.dispose();
- }
- }
-
- // Sets up the view using the normal (mock) ExtensionManager data.
- async function setupViewWithMockData(ModelClass) {
- view = new ExtensionManagerView();
- model = new ModelClass();
- modelDisposed = false;
- await awaitsForDone(view.initialize(model), "view initializing");
- view.$el.appendTo(window.document.body);
- spyOn(view.model, "dispose").and.callThrough();
- }
-
describe("ExtensionManager", function () {
it("should download the extension list from the registry", async function () {
await awaitsForDone(ExtensionManager.downloadRegistry(true), "fetching registry");
@@ -319,7 +272,7 @@ define(function (require, exports, module) {
await mockLoadExtensions(["user/mock-extension-3"]);
ExtensionManager.on("statusChange.unit-test", spy);
await awaitsForDone(ExtensionManager.remove("mock-extension-3"));
- var mockPath = window.fsServerUrl + SpecRunnerUtils.getTestPath("/spec/ExtensionManager-test-files");
+ var mockPath = Phoenix.VFS.getVirtualServingURLForPath(testPath);
expect(removedPath).toBe(mockPath + "/user/mock-extension-3");
expect(spy).toHaveBeenCalledWith(jasmine.any(Object), "mock-extension-3");
expect(ExtensionManager.extensions["mock-extension-3"].installInfo).toBeFalsy();
@@ -330,7 +283,7 @@ define(function (require, exports, module) {
await mockLoadExtensions(["user/mock-extension-3"]);
ExtensionManager.on("statusChange.unit-test", spy);
await awaitsForDone(ExtensionManager.disable("mock-extension-3"));
- var mockPath = window.fsServerUrl + SpecRunnerUtils.getTestPath("/spec/ExtensionManager-test-files");
+ var mockPath = Phoenix.VFS.getVirtualServingURLForPath(testPath);
expect(disabledFilePath).toBe(mockPath + "/user/mock-extension-3" + "/.disabled");
expect(spy).toHaveBeenCalledWith(jasmine.any(Object), "mock-extension-3");
expect(ExtensionManager.extensions["mock-extension-3"].installInfo.status).toEqual(ExtensionManager.DISABLED);
@@ -341,7 +294,7 @@ define(function (require, exports, module) {
await mockLoadExtensions(["user/mock-extension-2"], "disable");
ExtensionManager.on("statusChange.unit-test", spy);
await awaitsForDone(ExtensionManager.enable("mock-extension-2"));
- var mockPath = window.fsServerUrl + SpecRunnerUtils.getTestPath("/spec/ExtensionManager-test-files");
+ var mockPath = Phoenix.VFS.getVirtualServingURLForPath(testPath);
expect(disabledFilePath).toBe(mockPath + "/user/mock-extension-2" + "/.disabled");
expect(spy).toHaveBeenCalledWith(jasmine.any(Object), "mock-extension-2");
expect(ExtensionManager.extensions["mock-extension-2"].installInfo.status).toEqual(ExtensionManager.ENABLED);
diff --git a/test/spec/LowLevelFileIO-test.js b/test/spec/LowLevelFileIO-test.js
index 99e26900a..81a7259fd 100644
--- a/test/spec/LowLevelFileIO-test.js
+++ b/test/spec/LowLevelFileIO-test.js
@@ -618,18 +618,83 @@ define(function (require, exports, module) {
describe("specialDirectories", function () {
it("should have an application support directory", async function () {
- expect(brackets.app.getApplicationSupportDirectory().length).not.toBe(0);
+ // these tests are here as these are absolute unchanging dir convention used by phoenix.
+ if(window.__TAURI__){
+ const appSupportDIR = window.fs.getTauriVirtualPath(window._tauriBootVars.appLocalDir);
+ expect(brackets.app.getApplicationSupportDirectory().startsWith("/tauri/")).toBeTrue();
+ expect(brackets.app.getApplicationSupportDirectory()).toBe(appSupportDIR);
+ } else {
+ expect(brackets.app.getApplicationSupportDirectory()).toBe('/fs/app/');
+ }
});
it("should have a user documents directory", function () {
- expect(brackets.app.getUserDocumentsDirectory().length).not.toBe(0);
- });
- it("should get virtual serving directory from virtual serving URL", async function () {
+ // these tests are here as these are absolute unchanging dir convention used by phoenix.
+ if(window.__TAURI__){
+ const documentsDIR = window.fs.getTauriVirtualPath(window._tauriBootVars.documentDir);
+ expect(brackets.app.getUserDocumentsDirectory().startsWith("/tauri/")).toBeTrue();
+ expect(brackets.app.getUserDocumentsDirectory()).toBe(documentsDIR);
+ } else {
+ expect(brackets.app.getUserDocumentsDirectory()).toBe('/fs/local/');
+ }
+ });
+ it("should have a user projects directory", function () {
+ // these tests are here as these are absolute unchanging dir convention used by phoenix.
+ if(window.__TAURI__){
+ const documentsDIR = window.fs.getTauriVirtualPath(window._tauriBootVars.documentDir);
+ const appName = window._tauriBootVars.appname;
+ const userProjectsDir = `${documentsDIR}${appName}/`;
+ expect(brackets.app.getUserProjectsDirectory().startsWith("/tauri/")).toBeTrue();
+ expect(brackets.app.getUserProjectsDirectory()).toBe(userProjectsDir);
+ } else {
+ expect(brackets.app.getUserProjectsDirectory()).toBe('/fs/local/');
+ }
+ });
+ it("should have a temp directory", function () {
+ // these tests are here as these are absolute unchanging dir convention used by phoenix.
+ if(window.__TAURI__){
+ let tempDIR = window.fs.getTauriVirtualPath(window._tauriBootVars.tempDir);
+ if(!tempDIR.endsWith("/")){
+ tempDIR = `${tempDIR}/`;
+ }
+ const appName = window._tauriBootVars.appname;
+ tempDIR = `${tempDIR}${appName}/`;
+ expect(brackets.app.getTempDirectory().startsWith("/tauri/")).toBeTrue();
+ expect(brackets.app.getTempDirectory()).toBe(tempDIR);
+ } else {
+ expect(brackets.app.getTempDirectory()).toBe('/temp/');
+ }
+ });
+ it("should have extensions directory", function () {
+ // these tests are here as these are absolute unchanging dir convention used by phoenix.
+ if(window.__TAURI__){
+ const appSupportDIR = window.fs.getTauriVirtualPath(window._tauriBootVars.appLocalDir);
+ const extensionsDir = `${appSupportDIR}assets/extensions/`;
+ expect(brackets.app.getExtensionsDirectory().startsWith("/tauri/")).toBeTrue();
+ expect(brackets.app.getExtensionsDirectory()).toBe(extensionsDir);
+ } else {
+ expect(brackets.app.getExtensionsDirectory()).toBe('/fs/app/extensions/');
+ }
+ });
+
+ it("should get virtual serving directory from virtual serving URL in browser", async function () {
+ if(window.__TAURI__){
+ return;
+ }
expect(brackets.VFS.getPathForVirtualServingURL(`${window.fsServerUrl}blinker`)).toBe("/blinker");
expect(brackets.VFS.getPathForVirtualServingURL(`${window.fsServerUrl}path/to/file_x.mp3`))
.toBe("/path/to/file_x.mp3");
expect(brackets.VFS.getPathForVirtualServingURL("/some/path")).toBe(null);
expect(brackets.VFS.getPathForVirtualServingURL("/fs")).toBe(null);
});
+
+ it("should not get virtual serving directory from virtual serving URL in tauri", async function () {
+ if(!window.__TAURI__){
+ return;
+ }
+ expect(window.fsServerUrl).not.toBeDefined();
+ expect(brackets.VFS.getPathForVirtualServingURL("/some/path")).toBe(null);
+ expect(brackets.VFS.getPathForVirtualServingURL("/fs")).toBe(null);
+ });
});
});
});
diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js
index c661bd082..24bd18f97 100644
--- a/test/spec/SpecRunnerUtils.js
+++ b/test/spec/SpecRunnerUtils.js
@@ -89,6 +89,10 @@ define(function (require, exports, module) {
return result.promise();
}
+ async function deletePathAsync(fullPath, silent) {
+ return jsPromise(deletePath(fullPath, silent));
+ }
+
/**
* Remove a directory (recursively) or file
*
@@ -879,6 +883,10 @@ define(function (require, exports, module) {
return deferred.promise();
}
+ function createTextFileAsync(path, text) {
+ return jsPromise(createTextFile(path, text, _getFileSystem()));
+ }
+
/**
* Copy a file source path to a destination
* @param {!File} source Entry for the source file to copy
@@ -1248,7 +1256,11 @@ define(function (require, exports, module) {
return 0;
}
- function pathExists(pathToCheck, isFolder = true) {
+ async function ensureExistsDirAsync(pathToExist) {
+ await window.Phoenix.VFS.ensureExistsDirAsync(pathToExist);
+ }
+
+ async function pathExists(pathToCheck, isFolder = true) {
let entry = isFolder ? FileSystem.getDirectoryForPath(pathToCheck)
: FileSystem.getFileForPath(pathToCheck);
return entry.existsAsync(pathToCheck);
@@ -1322,11 +1334,14 @@ define(function (require, exports, module) {
exports.openProjectFiles = openProjectFiles;
exports.toggleQuickEditAtOffset = toggleQuickEditAtOffset;
exports.createTextFile = createTextFile;
+ exports.createTextFileAsync = createTextFileAsync;
exports.copyDirectoryEntry = copyDirectoryEntry;
exports.copyFileEntry = copyFileEntry;
exports.copyPath = copyPath;
exports.deletePath = deletePath;
+ exports.deletePathAsync = deletePathAsync;
exports.pathExists = pathExists;
+ exports.ensureExistsDirAsync = ensureExistsDirAsync;
exports.waitTillPathExists = waitTillPathExists;
exports.waitTillPathNotExists = waitTillPathNotExists;
exports.getTestWindow = getTestWindow;
diff --git a/test/spec/Tauri-platform-test.js b/test/spec/Tauri-platform-test.js
new file mode 100644
index 000000000..635b44ca5
--- /dev/null
+++ b/test/spec/Tauri-platform-test.js
@@ -0,0 +1,96 @@
+/*
+ * GNU AGPL-3.0 License
+ *
+ * Copyright (c) 2021 - present core.ai . All rights reserved.
+ * Original work Copyright (c) 2013 - 2021 Adobe Systems Incorporated. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see https://opensource.org/licenses/AGPL-3.0.
+ *
+ */
+
+/*global describe, it, expect, beforeEach, afterEach, fs, path*/
+
+define(function (require, exports, module) {
+ if(!window.__TAURI__) {
+ return;
+ }
+
+ const SpecRunnerUtils = require("spec/SpecRunnerUtils");
+
+ describe("unit: Tauri Platform Tests", function () {
+
+ beforeEach(async function () {
+
+ });
+
+ afterEach(async function () {
+
+ });
+
+ describe("asset url tests", function () {
+ it("Should be able to fetch files in {appLocalData}/assets folder", async function () {
+ const appLocalData = fs.getTauriVirtualPath(await window.__TAURI__.path.appLocalDataDir());
+ expect(await SpecRunnerUtils.pathExists(appLocalData, true)).toBeTrue();
+ expect(appLocalData.split("/")[1]).toEql("tauri"); // should be /tauri/applocaldata/path
+
+ // now write a test html file to the assets folder
+ const assetHTMLPath = `${appLocalData}/assets/a9322657236.html`;
+ const assetHtmlText = "Hello world random37834324";
+ await SpecRunnerUtils.ensureExistsDirAsync(path.dirname(assetHTMLPath));
+ await SpecRunnerUtils.createTextFileAsync(assetHTMLPath, assetHtmlText);
+
+ const appLocalDataPlatformPath = fs.getTauriPlatformPath(assetHTMLPath);
+ const appLocalDataURL = window.__TAURI__.tauri.convertFileSrc(appLocalDataPlatformPath);
+
+ const fetchedData = await ((await fetch(appLocalDataURL)).text());
+ expect(fetchedData).toEqual(assetHtmlText);
+
+ // delete test file
+ await SpecRunnerUtils.deletePathAsync(assetHTMLPath);
+ });
+
+ async function testAssetNotAccessibleFolder(platformPath) {
+ const assets = fs.getTauriVirtualPath(platformPath);
+ expect(assets.split("/")[1]).toEql("tauri"); // should be /tauri/applocaldata/path
+
+ // now write a test html file to the assets folder
+ const assetHTMLPath = `${assets}/a9322657236.html`;
+ const assetHtmlText = "Hello world random37834324";
+ await SpecRunnerUtils.createTextFileAsync(assetHTMLPath, assetHtmlText);
+
+ const appLocalDataPlatformPath = fs.getTauriPlatformPath(assetHTMLPath);
+ const appLocalDataURL = window.__TAURI__.tauri.convertFileSrc(appLocalDataPlatformPath);
+
+ let err;
+ try{
+ await fetch(appLocalDataURL);
+ } catch (e) {
+ err = e;
+ }
+ expect(err).toBeDefined();
+
+ // delete test file
+ await SpecRunnerUtils.deletePathAsync(assetHTMLPath);
+ }
+
+ it("Should not be able to fetch files in documents folder", async function () {
+ await testAssetNotAccessibleFolder(await window.__TAURI__.path.documentDir());
+ });
+
+ it("Should not be able to fetch files in appLocalData folder", async function () {
+ await testAssetNotAccessibleFolder(await window.__TAURI__.path.appLocalDataDir());
+ });
+ });
+ });
+});
diff --git a/test/virtual-server-loader.js b/test/virtual-server-loader.js
index ef91de63c..68393559f 100644
--- a/test/virtual-server-loader.js
+++ b/test/virtual-server-loader.js
@@ -37,7 +37,9 @@ function getRoute(){
return `${basePath}/phoenix/vfs`;
}
-window.fsServerUrl = window.location.origin + getRoute() + "/";
+if(!window.__TAURI__) {
+ window.fsServerUrl = window.location.origin + getRoute() + "/";
+}
function serverReady() {
console.log(`Server ready! Serving files on url: ${window.location.origin + getRoute()}`);