powerbi-visuals-tools 4.3.3 → 5.0.0

package/spec/e2e/pbivizPackageSpec.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-useless-escape */
 /*
  *  Power BI Visual CLI
  *
@@ -26,25 +27,25 @@
 
 "use strict";
 
-const fs = require('fs-extra');
-const path = require('path');
-const async = require('async');
-const JSZip = require('jszip');
-const lodashIsEqual = require('lodash.isequal');
-
-const FileSystem = require('../helpers/FileSystem.js');
-const writeMetadata = require("./utils").writeMetadata;
+import fs from 'fs-extra';
+import path from 'path';
+import async from 'async';
+import JSZip from 'jszip';
+import lodashIsEqual from 'lodash.isequal';
+import FileSystem from '../helpers/FileSystem.js';
+import { writeMetadata } from "./testUtils.js";
 
 const tempPath = FileSystem.getTempPath();
 const startPath = process.cwd();
 
 describe("E2E - pbiviz package", () => {
 
-    let visualName = 'visualname';
-    let visualPath = path.join(tempPath, visualName);
+    const visualName = 'visualname';
+    const visualPath = path.join(tempPath, visualName);
     let visualPbiviz = {};
 
     beforeEach(() => {
+        process.chdir(startPath);
         FileSystem.resetTempDirectory();
         process.chdir(tempPath);
         FileSystem.runPbiviz('new', visualName);
@@ -56,10 +57,6 @@ describe("E2E - pbiviz package", () => {
         visualPbiviz = JSON.parse(fs.readFileSync(path.join(visualPath, 'pbiviz.json'), { encoding: "utf8" }));
     });
 
-    afterEach(() => {
-        process.chdir(startPath);
-    });
-
     afterAll(() => {
         process.chdir(startPath);
         FileSystem.deleteTempDirectory();
@@ -94,61 +91,61 @@ describe("E2E - pbiviz package", () => {
     });
 
     it("Should create a pbiviz file and no resources folder with no flags", () => {
+        let error;
         FileSystem.runPbiviz('package');
 
-        let pbivizPath = path.join(visualPath, 'dist', visualPbiviz.visual.guid + "." + visualPbiviz.visual.version + '.pbiviz');
-        let resourcesPath = path.join(visualPath, 'dist', 'resources');
+        const pbivizPath = path.join(visualPath, 'dist', visualPbiviz.visual.guid + "." + visualPbiviz.visual.version + '.pbiviz');
+        const resourcesPath = path.join(visualPath, 'dist', 'resources');
 
-        let resourcesError;
         try {
             fs.accessSync(resourcesPath);
         } catch (e) {
-            resourcesError = e;
+            error = e
         }
+        expect(error).toBeDefined();
+        expect(error.code).toBe('ENOENT');
 
-        expect(resourcesError).toBeDefined();
-        expect(resourcesError.code).toBe('ENOENT');
         expect(fs.statSync(pbivizPath).isFile()).toBe(true);
     });
 
     it("Should create a pbiviz file and resource folder with --resources flag", () => {
-        FileSystem.runPbiviz('package', false, '--resources');
+        FileSystem.runPbiviz('package', undefined, '--resources');
 
-        let pbivizPath = path.join(visualPath, 'dist', visualPbiviz.visual.guid + "." + visualPbiviz.visual.version + '.pbiviz');
-        let resourcesPath = path.join(visualPath, 'dist', 'resources');
+        const pbivizPath = path.join(visualPath, 'dist', visualPbiviz.visual.guid + "." + visualPbiviz.visual.version + '.pbiviz');
+        const resourcesPath = path.join(visualPath, 'dist', 'resources');
 
         expect(fs.statSync(pbivizPath).isFile()).toBe(true);
         expect(fs.statSync(resourcesPath).isDirectory()).toBe(true);
     });
 
     it("Should not create pbiviz file with --no-pbiviz flag", () => {
-        FileSystem.runPbiviz('package', false, '--no-pbiviz --resources');
+        let error
+        FileSystem.runPbiviz('package', undefined, '--no-pbiviz --resources');
 
-        let pbivizPath = path.join(visualPath, 'dist', visualPbiviz.visual.guid + "." + visualPbiviz.visual.version + '.pbiviz');
-        let resourcesPath = path.join(visualPath, 'dist', 'resources');
+        const pbivizPath = path.join(visualPath, 'dist', visualPbiviz.visual.guid + "." + visualPbiviz.visual.version + '.pbiviz');
+        const resourcesPath = path.join(visualPath, 'dist', 'resources');
 
-        let pbivizError;
         try {
             fs.accessSync(pbivizPath);
         } catch (e) {
-            pbivizError = e;
+            error = e
         }
+        expect(error).toBeDefined();
+        expect(error.code).toBe('ENOENT');
 
-        expect(pbivizError).toBeDefined();
-        expect(pbivizError.code).toBe('ENOENT');
         expect(fs.statSync(resourcesPath).isDirectory()).toBe(true);
     });
 
     it("Should correctly generate pbiviz file", (done) => {
         FileSystem.runPbiviz('package');
 
-        let visualConfig = fs.readJsonSync(path.join(visualPath, 'pbiviz.json')).visual;
-        let visualCapabilities = fs.readJsonSync(path.join(visualPath, 'capabilities.json'));
-        let pbivizPath = path.join(visualPath, 'dist', visualPbiviz.visual.guid + "." + visualPbiviz.visual.version + '.pbiviz');
-        let pbivizResourcePath = `resources/${visualConfig.guid}.pbiviz.json`;
+        const visualConfig = fs.readJsonSync(path.join(visualPath, 'pbiviz.json')).visual;
+        const visualCapabilities = fs.readJsonSync(path.join(visualPath, 'capabilities.json'));
+        const pbivizPath = path.join(visualPath, 'dist', visualPbiviz.visual.guid + "." + visualPbiviz.visual.version + '.pbiviz');
+        const pbivizResourcePath = `resources/${visualConfig.guid}.pbiviz.json`;
 
-        let zipContents = fs.readFileSync(pbivizPath);
-        let jszip = new JSZip();
+        const zipContents = fs.readFileSync(pbivizPath);
+        const jszip = new JSZip();
         jszip.loadAsync(zipContents)
             .then((zip) => {
                 async.parallel([
@@ -156,7 +153,7 @@ describe("E2E - pbiviz package", () => {
                     (next) => {
                         zip.file('package.json').async('string')
                             .then((content) => {
-                                let data = JSON.parse(content);
+                                const data = JSON.parse(content);
                                 expect(data.resources.length).toBe(1);
                                 expect(data.resources[0].file).toBe(pbivizResourcePath);
                                 expect(data.visual).toEqual(visualConfig);
@@ -168,7 +165,7 @@ describe("E2E - pbiviz package", () => {
                     (next) => {
                         zip.file(pbivizResourcePath).async('string')
                             .then((content) => {
-                                let data = JSON.parse(content);
+                                const data = JSON.parse(content);
                                 expect(data.visual).toEqual(visualConfig);
                                 expect(data.capabilities).toEqual(visualCapabilities);
                                 expect(data.content.js).toBeDefined();
@@ -189,19 +186,19 @@ describe("E2E - pbiviz package", () => {
     });
 
     it("Should correctly generate resources folder", () => {
-        FileSystem.runPbiviz('package', false, '--no-pbiviz --resources');
+        FileSystem.runPbiviz('package', undefined, '--no-pbiviz --resources');
 
-        let visualConfig = fs.readJsonSync(path.join(visualPath, 'pbiviz.json')).visual;
-        let visualCapabilities = fs.readJsonSync(path.join(visualPath, 'capabilities.json'));
-        let resourcesPath = path.join(visualPath, 'dist', 'resources');
-        let pbivizPath = path.join(resourcesPath, visualPbiviz.visual.guid + '.pbiviz.json');
+        const visualConfig = fs.readJsonSync(path.join(visualPath, 'pbiviz.json')).visual;
+        const visualCapabilities = fs.readJsonSync(path.join(visualPath, 'capabilities.json'));
+        const resourcesPath = path.join(visualPath, 'dist', 'resources');
+        const pbivizPath = path.join(resourcesPath, visualPbiviz.visual.guid + '.pbiviz.json');
 
         expect(fs.statSync(resourcesPath).isDirectory()).toBe(true);
         expect(fs.statSync(path.join(resourcesPath, 'visual.prod.js')).isFile()).toBe(true);
         expect(fs.statSync(path.join(resourcesPath, 'visual.prod.css')).isFile()).toBe(true);
         expect(fs.statSync(pbivizPath).isFile()).toBe(true);
 
-        let pbiviz = fs.readJsonSync(pbivizPath);
+        const pbiviz = fs.readJsonSync(pbivizPath);
         expect(pbiviz.visual).toEqual(visualConfig);
         expect(pbiviz.capabilities).toEqual(visualCapabilities);
         expect(pbiviz.content.js).toBeDefined();
@@ -212,41 +209,41 @@ describe("E2E - pbiviz package", () => {
     // tets can't check the minification, because in input the plugin gets minified version, 
     // plugin can't create two version js file for compare
     xit("Should minify assets by default", () => {
-        FileSystem.runPbiviz('package', false, '--resources --no-pbiviz');
+        FileSystem.runPbiviz('package', undefined, '--resources --no-pbiviz');
 
-        let js = fs.statSync(path.join(visualPath, 'dist', 'resources', 'visual.js'));
+        const js = fs.statSync(path.join(visualPath, 'dist', 'resources', 'visual.js'));
 
-        let prodJs = fs.statSync(path.join(visualPath, 'dist', 'resources', 'visual.prod.js'));
+        const prodJs = fs.statSync(path.join(visualPath, 'dist', 'resources', 'visual.prod.js'));
 
         expect(js.size).toBeGreaterThan(prodJs.size);
     });
 
     it("Should skip minification with --no-minify flag", () => {
-        FileSystem.runPbiviz('package', false, '--resources --no-pbiviz --no-minify');
+        FileSystem.runPbiviz('package', undefined, '--resources --no-pbiviz --no-minify');
 
-        let js = fs.statSync(path.join(visualPath, 'dist', 'resources', 'visual.js'));
+        const js = fs.statSync(path.join(visualPath, 'dist', 'resources', 'visual.js'));
 
-        let prodJs = fs.statSync(path.join(visualPath, 'dist', 'resources', 'visual.prod.js'));
+        const prodJs = fs.statSync(path.join(visualPath, 'dist', 'resources', 'visual.prod.js'));
 
         expect(js.size).toBe(prodJs.size);
     });
 
     it("Should set all versions in metadata equal", (done) => {
-        let visualVersion = "1.2.3";
+        const visualVersion = "1.2.3.4";
 
-        let pbivizJsonPath = path.join(visualPath, 'pbiviz.json');
-        let pbiviz = fs.readJsonSync(pbivizJsonPath);
+        const pbivizJsonPath = path.join(visualPath, 'pbiviz.json');
+        const pbiviz = fs.readJsonSync(pbivizJsonPath);
         pbiviz.visual.version = visualVersion;
         fs.writeFileSync(pbivizJsonPath, JSON.stringify(pbiviz));
         FileSystem.runCMDCommand('npm i', visualPath);
         FileSystem.runPbiviz('package');
 
-        let visualConfig = fs.readJsonSync(path.join(visualPath, 'pbiviz.json')).visual;
-        let pbivizPath = path.join(visualPath, 'dist', visualPbiviz.visual.guid + "." + pbiviz.visual.version + '.pbiviz');
-        let pbivizResourcePath = `resources/${visualConfig.guid}.pbiviz.json`;
+        const visualConfig = fs.readJsonSync(path.join(visualPath, 'pbiviz.json')).visual;
+        const pbivizPath = path.join(visualPath, 'dist', visualPbiviz.visual.guid + "." + pbiviz.visual.version + '.pbiviz');
+        const pbivizResourcePath = `resources/${visualConfig.guid}.pbiviz.json`;
 
-        let zipContents = fs.readFileSync(pbivizPath);
-        let jszip = new JSZip();
+        const zipContents = fs.readFileSync(pbivizPath);
+        const jszip = new JSZip();
         jszip.loadAsync(zipContents)
             .then((zip) => {
                 async.parallel([
@@ -254,7 +251,7 @@ describe("E2E - pbiviz package", () => {
                     next => {
                         zip.file('package.json').async('string')
                             .then((content) => {
-                                let data = JSON.parse(content);
+                                const data = JSON.parse(content);
                                 expect(data.visual.version).toEqual(visualVersion);
                                 expect(data.version).toEqual(visualVersion);
                                 next();
@@ -265,7 +262,7 @@ describe("E2E - pbiviz package", () => {
                     next => {
                         zip.file(pbivizResourcePath).async('string')
                             .then((content) => {
-                                let data = JSON.parse(content);
+                                const data = JSON.parse(content);
                                 expect(data.visual.version).toEqual(visualVersion);
                                 next();
                             })
@@ -308,7 +305,7 @@ describe("E2E - pbiviz package", () => {
                 return writeJsonPromise('pbiviz.json', pbivizJson);
             })
             .then(() => 
-                FileSystem.runPbiviz('package', false, '--no-pbiviz --no-minify --resources')
+                FileSystem.runPbiviz('package', undefined, '--no-pbiviz --no-minify --resources')
             )
             .then(() => 
                 readJsonPromise(path.join(visualPath, 'dist', 'resources', visualPbiviz.visual.guid + '.pbiviz.json'))
@@ -359,7 +356,7 @@ describe("E2E - pbiviz package", () => {
                         .then(() => writeJsonPromise('stringResources/ru-RU/resources.resjson', ResJsonRuLocalization))
                 ]))
             .then(() => 
-                FileSystem.runPbiviz('package', false, '--no-pbiviz --no-minify --resources')
+                FileSystem.runPbiviz('package', undefined, '--no-pbiviz --no-minify --resources')
             )
             .then(() => 
                 readJsonPromise(path.join(visualPath, 'dist', 'resources', visualPbiviz.visual.guid + '.pbiviz.json'))
@@ -430,7 +427,7 @@ describe("E2E - pbiviz package", () => {
                 return writeJsonPromise('pbiviz.json', pbivizJson);
             })
             .then(() => 
-                FileSystem.runPbiviz('package', false, '--no-pbiviz --no-minify --resources')
+                FileSystem.runPbiviz('package', undefined, '--no-pbiviz --no-minify --resources')
             )
             .then(() => readJsonPromise(path.join(visualPath, 'dist', 'resources', visualPbiviz.visual.guid + '.pbiviz.json')))
             .then((pbivizJson) => {
@@ -457,12 +454,11 @@ describe("E2E - pbiviz package", () => {
         FileSystem.runPbiviz('package', '--no-stats');
         const statisticFilePath = path.join(visualPath, 'webpack.statistics.prod.html');
         try { 
-            fs.statSync(statisticFilePath).isFile();
+            expect(fs.statSync(statisticFilePath).isFile()).toBe(false);
         } catch (error) {
             expect(error).not.toBeNull();
         }
     });
-
 });
 
 function mkDirPromise(path) {
@@ -502,7 +498,7 @@ function testMissingScript(fname) {
     try {
         FileSystem.runPbiviz('package');
     } catch (e) {
-        error = e;
+        error = e
     }
     expect(error).toBeDefined();
     expect(error.status).toBe(1);
@@ -511,7 +507,7 @@ function testMissingScript(fname) {
 
 function testErrorInDependencies() {
     let error;
-    let invalidDependencies = [
+    const invalidDependencies = [
         {
             invalidPropertyName: "ddd"
         }
@@ -536,10 +532,10 @@ function testPbivizPackage(done, visualPath, visualName, scriptSourceDefault, re
 
     FileSystem.runPbiviz('package');
 
-    let visualConfig = fs.readJsonSync(path.join(visualPath, 'pbiviz.json')).visual;
-    let visualCapabilities = fs.readJsonSync(path.join(visualPath, 'capabilities.json'));
-    let pbivizPath = path.join(visualPath, 'dist', visualName + '.pbiviz');
-    let pbivizResourcePath = `resources/${visualConfig.guid}.pbiviz.json`;
+    const visualConfig = fs.readJsonSync(path.join(visualPath, 'pbiviz.json')).visual;
+    const visualCapabilities = fs.readJsonSync(path.join(visualPath, 'capabilities.json'));
+    const pbivizPath = path.join(visualPath, 'dist', visualName + '.pbiviz');
+    const pbivizResourcePath = `resources/${visualConfig.guid}.pbiviz.json`;
 
     visualCapabilities.dataViewMappings[0].scriptResult.script.scriptSourceDefault = scriptSourceDefault;
 
@@ -548,8 +544,8 @@ function testPbivizPackage(done, visualPath, visualName, scriptSourceDefault, re
         dependencies = fs.readJsonSync(path.join(visualPath, 'dependencies.json'));
     }
 
-    let zipContents = fs.readFileSync(pbivizPath);
-    let jszip = new JSZip();
+    const zipContents = fs.readFileSync(pbivizPath);
+    const jszip = new JSZip();
     jszip.loadAsync(zipContents)
         .then((zip) => {
             async.parallel([
@@ -557,7 +553,7 @@ function testPbivizPackage(done, visualPath, visualName, scriptSourceDefault, re
                 (next) => {
                     zip.file('package.json').async('string')
                         .then((content) => {
-                            let data = JSON.parse(content);
+                            const data = JSON.parse(content);
                             expect(data.resources.length).toBe(1);
                             expect(data.resources[0].file).toBe(pbivizResourcePath);
                             expect(data.visual).toEqual(visualConfig);
@@ -569,7 +565,7 @@ function testPbivizPackage(done, visualPath, visualName, scriptSourceDefault, re
                 (next) => {
                     zip.file(pbivizResourcePath).async('string')
                         .then((content) => {
-                            let data = JSON.parse(content);
+                            const data = JSON.parse(content);
                             expect(data.visual).toEqual(visualConfig);
                             expect(data.capabilities).toEqual(visualCapabilities);
                             expect(data.content.js).toBeDefined();
@@ -593,8 +589,8 @@ function testPbivizPackage(done, visualPath, visualName, scriptSourceDefault, re
 // new tools doesn't support R visuals build. coming soon
 xdescribe("E2E - pbiviz package for R Visual template", () => {
 
-    let visualName = 'visualname';
-    let visualPath = path.join(tempPath, visualName);
+    const visualName = 'visualname';
+    const visualPath = path.join(tempPath, visualName);
 
     beforeEach(() => {
         FileSystem.resetTempDirectory();
@@ -622,14 +618,14 @@ xdescribe("E2E - pbiviz package for R Visual template", () => {
     });
 
     it("Should correctly generate pbiviz file for R Visual template - no dependencies file", (done) => {
-        let scriptSourceDefault = fs.readFileSync(path.join(visualPath, 'script.r')).toString();
-        let removeDependencies = true;
+        const scriptSourceDefault = fs.readFileSync(path.join(visualPath, 'script.r')).toString();
+        const removeDependencies = true;
         testPbivizPackage(done, visualPath, visualName, scriptSourceDefault, removeDependencies);
     });
 
     it("Should correctly generate pbiviz file for R Visual template", (done) => {
-        let scriptSourceDefault = fs.readFileSync(path.join(visualPath, 'script.r')).toString();
-        let removeDependencies = false;
+        const scriptSourceDefault = fs.readFileSync(path.join(visualPath, 'script.r')).toString();
+        const removeDependencies = false;
         testPbivizPackage(done, visualPath, visualName, scriptSourceDefault, removeDependencies);
     });
 });
@@ -637,13 +633,13 @@ xdescribe("E2E - pbiviz package for R Visual template", () => {
 // new tools doesn't support R visuals build. coming soon
 xdescribe("E2E - pbiviz package for R HTML template", () => {
 
-    let visualName = 'visualname';
-    let visualPath = path.join(tempPath, visualName);
+    const visualName = 'visualname';
+    const visualPath = path.join(tempPath, visualName);
 
     function getScriptSourceDefault() {
-        let FlattenScriptContent = fs.readFileSync(path.join(visualPath, 'r_files/flatten_HTML.r')).toString();
-        let scriptContent = fs.readFileSync(path.join(visualPath, 'script.r')).toString();
-        let pattern = "source('./r_files/flatten_HTML.r')";
+        const FlattenScriptContent = fs.readFileSync(path.join(visualPath, 'r_files/flatten_HTML.r')).toString();
+        const scriptContent = fs.readFileSync(path.join(visualPath, 'script.r')).toString();
+        const pattern = "source('./r_files/flatten_HTML.r')";
         return scriptContent.replace(pattern, FlattenScriptContent);
     }
 
@@ -677,14 +673,14 @@ xdescribe("E2E - pbiviz package for R HTML template", () => {
     });
 
     it("Should correctly generate pbiviz file for R HTML template - no dependencies file", (done) => {
-        let scriptSourceDefault = getScriptSourceDefault();
-        let removeDependencies = true;
+        const scriptSourceDefault = getScriptSourceDefault();
+        const removeDependencies = true;
         testPbivizPackage(done, visualPath, visualName, scriptSourceDefault, removeDependencies);
     });
 
     it("Should correctly generate pbiviz file for R HTML template", (done) => {
-        let scriptSourceDefault = getScriptSourceDefault();
-        let removeDependencies = false;
+        const scriptSourceDefault = getScriptSourceDefault();
+        const removeDependencies = false;
         testPbivizPackage(done, visualPath, visualName, scriptSourceDefault, removeDependencies);
     });
 });

package/spec/e2e/pbivizStartSpec.js

@@ -26,13 +26,12 @@
 
 "use strict";
 
-const fs = require('fs-extra');
-const path = require('path');
-const async = require('async');
-const FileSystem = require('../helpers/FileSystem.js');
-const writeMetadata = require("./utils").writeMetadata;
-const download = require("../../lib/utils").download;
-const createFolder = require("../../lib/utils").createFolder;
+import fs from 'fs-extra';
+import path from 'path';
+import async from 'async';
+import FileSystem from '../helpers/FileSystem.js';
+import { writeMetadata } from "./testUtils.js";
+import { download, createFolder } from "../../lib/utils.js";
 
 const tempPath = FileSystem.getTempPath();
 const startPath = process.cwd();

package/spec/e2e/pbivizWebpackVerSpec.js

@@ -26,12 +26,11 @@
 
 "use strict";
 
-const fs = require('fs-extra');
-const path = require('path');
-
-const FileSystem = require('../helpers/FileSystem.js');
-const writeMetadata = require("./utils").writeMetadata;
-const semver = require('semver');
+import fs from 'fs-extra';
+import path from 'path';
+import semver from 'semver';
+import FileSystem from '../helpers/FileSystem.js';
+import { writeMetadata } from "./testUtils.js";
 
 const tempPath = FileSystem.getTempPath();
 const startPath = process.cwd();
@@ -57,11 +56,10 @@ describe("E2E - webpack tools", () => {
         FileSystem.deleteTempDirectory();
     });
 
-    let removeApi = () => {
-        let packageJson = fs.readJsonSync(path.join(visualPath, 'package.json'));
-        packageJson.dependencies = {
-            "powerbi-visuals-utils-dataviewutils": "2.0.1"
-        };
+    const removeApi = () => {
+        const packageJson = fs.readJsonSync(path.join(visualPath, 'package.json'));
+        delete packageJson.dependencies["powerbi-visuals-api"];
+
         fs.writeJsonSync(path.join(visualPath, 'package.json'), packageJson);
         
         fs.removeSync(path.join(visualPath, "node_modules", "powerbi-visuals-api"));
@@ -70,28 +68,28 @@ describe("E2E - webpack tools", () => {
     it("Should not add empty dependencies option into visual config", () => {
         FileSystem.runPbiviz('package');
 
-        let packageJson = fs.readJsonSync(path.join(visualPath, '.tmp/drop/pbiviz.json'));
+        const packageJson = fs.readJsonSync(path.join(visualPath, '.tmp/drop/pbiviz.json'));
         expect(packageJson.dependencies).not.toBeDefined();
     });
 
     it("Should install the latest powerbi-visual-api if apiVersion is undefined", () => {
-        let pbivizJson = fs.readJsonSync(path.join(visualPath, 'pbiviz.json'));
+        const pbivizJson = fs.readJsonSync(path.join(visualPath, 'pbiviz.json'));
         pbivizJson.apiVersion = null;
         fs.writeJsonSync(path.join(visualPath, 'pbiviz.json'), pbivizJson);
 
         removeApi();
         FileSystem.runPbiviz('package');
 
-        let packageJson = fs.readJsonSync(path.join(visualPath, 'package.json'));
+        const packageJson = fs.readJsonSync(path.join(visualPath, 'package.json'));
         expect(packageJson.dependencies["powerbi-visuals-api"]).toBeDefined();
     });
 
     it("Should install powerbi-visual-api with version from pbiviz.json on 'pbiviz start/package'", () => {
-        let pbivizJson = fs.readJsonSync(path.join(visualPath, 'pbiviz.json'));
+        const pbivizJson = fs.readJsonSync(path.join(visualPath, 'pbiviz.json'));
         removeApi();
         FileSystem.runPbiviz('package');
 
-        let packageJson = fs.readJsonSync(path.join(visualPath, 'package.json'));
+        const packageJson = fs.readJsonSync(path.join(visualPath, 'package.json'));
         expect(packageJson.dependencies["powerbi-visuals-api"]).toBeDefined();
         expect(semver.major(pbivizJson.apiVersion))
             .toBe(semver.major(packageJson.dependencies["powerbi-visuals-api"].replace(/\^|\~/, ""))); // eslint-disable-line no-useless-escape

package/spec/e2e/{utils.js → testUtils.js}

@@ -26,16 +26,16 @@
 
 "use strict";
 
-const path = require("path");
-const fs = require('fs-extra');
+import path from "path";
+import fs from 'fs-extra';
 
-let readdirSyncRecursive = (baseDir) => {
-    let read = (dir) => {
+export const readdirSyncRecursive = (baseDir) => {
+    const read = (dir) => {
         let results = [];
-        let list = fs.readdirSync(dir);
+        const list = fs.readdirSync(dir);
         list.forEach((file) => {
             file = dir + '/' + file;
-            let stat = fs.statSync(file);
+            const stat = fs.statSync(file);
             if (stat && stat.isDirectory()) { 
                 /* Recurse into a subdirectory */
                 results = results.concat(read(file));
@@ -49,15 +49,12 @@ let readdirSyncRecursive = (baseDir) => {
     return read(baseDir);
 };
 
-let writeMetadata = (visualPath) => {
-    let pbivizJSONFile = path.join(visualPath, '/pbiviz.json');
-    let pbiviz = fs.readJSONSync(pbivizJSONFile);
+export const writeMetadata = (visualPath) => {
+    const pbivizJSONFile = path.join(visualPath, '/pbiviz.json');
+    const pbiviz = fs.readJSONSync(pbivizJSONFile);
     pbiviz.visual.description = "description";
     pbiviz.visual.supportUrl = "supportUrl";
     pbiviz.author.name = "Microsoft";
     pbiviz.author.email = "pbicvsupport";
     fs.writeJSONSync(pbivizJSONFile, pbiviz);
 };
-
-module.exports.readdirSyncRecursive = readdirSyncRecursive;
-module.exports.writeMetadata = writeMetadata;

package/spec/helpers/FileSystem.js

@@ -26,21 +26,23 @@
 
 "use strict";
 
-let fs = require('fs-extra');
-let path = require('path');
-let childProcess = require('child_process');
-let treeKill = require('tree-kill');
-
-const TEMP_DIR = path.join(__dirname, '..', '.tmp');
-const BIN_PATH = path.join(__dirname, '..', '..', 'bin', 'pbiviz.js');
-const TEMPLATE_PATH = path.join(__dirname, '..', '..', 'templates');
-
-class FileSystem {
+import fs from 'fs-extra';
+import path from 'path';
+import childProcess from 'child_process';
+import treeKill from 'tree-kill';
+import { getRootPath } from '../../lib/utils.js';
+
+const rootPath = getRootPath();
+const TEMP_DIR = path.join(rootPath, 'spec/.tmp');
+const BIN_PATH = path.join(rootPath, 'bin/pbiviz.js');
+const TEMPLATE_PATH = path.join(rootPath, 'templates');
+
+export default class FileSystem {
     static expectFileToExist(fileName) {
         return new Promise((resolve, reject) => {
-            fs.exists(fileName, (exist) => {
+            fs.existsSync(fileName, (exist) => {
                 if (exist) {
-                    resolve();
+                    resolve(true);
                 } else {
                     reject(new Error(`File ${fileName} was expected to exist but not found...`));
                 }
@@ -62,12 +64,12 @@ class FileSystem {
 
     static expectFileToMatch(fileName, regEx) {
         return FileSystem.readFile(fileName)
-            .then(content => {
+            .then((content) => {
                 if (typeof regEx == 'string') {
-                    if (content.indexOf(regEx) == -1) {
+                    if ((content).indexOf(regEx) == -1) {
                         throw new Error(`File "${fileName}" did not contain "${regEx}"...`);
                     }
-                } else if (!content.match(regEx)) {
+                } else if (!(content).match(regEx)) {
                         throw new Error(`File "${fileName}" did not contain "${regEx}"...`);
                     }
             });
@@ -168,6 +170,4 @@ class FileSystem {
         });
     }
 
-}
-
-module.exports = FileSystem;
+}

package/spec/jasmine-runner.js

@@ -26,11 +26,11 @@
 
 "use strict";
 
-let Jasmine = require('jasmine');
-let SpecReporter = require('jasmine-spec-reporter').SpecReporter;
+import jasmine from 'jasmine';
+import { SpecReporter } from 'jasmine-spec-reporter';
 
-let jrunner = new Jasmine();
-jrunner.configureDefaultReporter({ print: () => {} }); // eslint-disable-line no-empty-function
-jasmine.getEnv().addReporter(new SpecReporter());
+let jrunner = new jasmine();
+jrunner.configureDefaultReporter({ print: () => {} });
+jrunner.addReporter(new SpecReporter());
 jrunner.loadConfigFile();
 jrunner.execute();