chore: correct path to fixtures in unittests

Author: aprilandjan

package.json

@@ -116,17 +116,18 @@
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "test": "yarn run compile && node ./out/test/runTest.js",
+    "lint": "eslint src",
     "prettify": "prettier --ignore-path .eslintignore '**/*.{js,jsx,ts,tsx,json,html,css,yml}' --write"
   },
   "devDependencies": {
     "@types/glob": "^7.1.1",
-    "@types/mocha": "^2.2.42",
+    "@types/mocha": "8",
     "@types/node": "12",
     "@types/vscode": "^1.50.0",
     "@typescript-eslint/eslint-plugin": "^4.16.0",
     "@typescript-eslint/parser": "^4.16.0",
     "eslint": "^7.21.0",
-    "mocha": "4",
+    "mocha": "8",
     "prettier": "^2.3.1",
     "typescript": "4",
     "vscode-test": "^1.5.2"

src/config.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import { IVsCodeConfig } from './lib/interface';
 
 export function getConfig(): IVsCodeConfig {
-  let config: IVsCodeConfig = {
+  const config: IVsCodeConfig = {
     ignore: ['node_modules'],
     rootCharCode: vscode.workspace
       .getConfiguration()

src/extension.ts

@@ -134,4 +134,6 @@ export function activate(context: vscode.ExtensionContext) {
 }
 
 // this method is called when your extension is deactivated
-export function deactivate() {}
+export function deactivate() {
+  //
+}

src/lib/directory.ts

@@ -70,9 +70,9 @@ export async function listDirectory(
   if (sort) {
     files = sortFilesLikeVSCode(files);
   }
-  let remainingDepth = maxDepth - 1;
+  const remainingDepth = maxDepth - 1;
   if (remainingDepth > 0) {
-    for (let file of files) {
+    for (const file of files) {
       if (file.isDirectory) {
         const subFiles = await listDirectory(file.absolutePath, {
           ...config,

src/lib/generator.ts

@@ -10,7 +10,7 @@ export const defaultCharset: ICharset = {
   blank: String.fromCharCode(32), // ' ',
 };
 
-function createTreeString(start: string, fill: string, size: number = 3) {
+function createTreeString(start: string, fill: string, size = 3) {
   let result = '';
   for (let i = 0; i < size; i++) {
     if (i === 0) {

src/lib/text.ts

@@ -1,7 +1,7 @@
 import { IFileTreeItem } from './interface';
 
 /** get line array. these lines are trimLeft with their common beginning substring. */
-function getLines(text: string = '') {
+function getLines(text = '') {
   //  split selected text into separate lines
   //  empty lines are ignored
   const lines = text.split('\n').filter((line) => line.trim() !== '');
@@ -28,9 +28,7 @@ function getLines(text: string = '') {
   return lines;
 }
 
-export function formatFileTreeItemsFromText(
-  text: string = ''
-): IFileTreeItem[] {
+export function formatFileTreeItemsFromText(text = ''): IFileTreeItem[] {
   const lines = getLines(text);
 
   //  find common hash
@@ -49,16 +47,16 @@ export function formatFileTreeItemsFromText(
     let item: IFileTreeItem;
     //  symbol
     let symbol = matched[0];
-    let name = line.slice(symbol.length).trim();
-    let hash = symbol.match(/#+/);
+    const name = line.slice(symbol.length).trim();
+    const hash = symbol.match(/#+/);
     let left = 0;
     //  if contains hash, read hash as its depth symbol
     if (hash) {
       left = symbol.length - hash[0].length;
       symbol = hash[0];
     }
     let depth = symbol.length;
-    let prev = list[index - 1];
+    const prev = list[index - 1];
     if (depth === 0) {
       depth = 1;
     }
@@ -86,7 +84,7 @@ export function formatFileTreeItemsFromText(
         prev.isLast = true;
         let siblingIndex = index - 1;
         let sibling = list[siblingIndex];
-        let lastMap: any = {};
+        const lastMap: any = {};
         while (siblingIndex >= 0 && sibling.depth !== depth) {
           //  make sure the previous lines are properly set 'isLast'
           if (sibling.depth > depth && !lastMap[sibling.depth]) {

src/test/extension.test.ts src/test/suite/extension.test.tssrc/test/extension.test.ts renamed to src/test/suite/extension.test.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as assert from 'assert';
-import { revertTreeString } from '../utils';
+import { revertTreeString } from '../../utils';
 
 // Defines a Mocha test suite to group tests of similar kind together
 suite('Extension Tests', function () {
@@ -14,11 +14,11 @@ suite('Extension Tests', function () {
   // });
   test('revert tree string to text', function () {
     const rootText = fs.readFileSync(
-      path.join(__dirname, '../../fixtures/root.txt'),
+      path.join(__dirname, '../../../fixtures/root.txt'),
       'utf8'
     );
     const rootReverted = fs.readFileSync(
-      path.join(__dirname, '../../fixtures/root-reverted.txt'),
+      path.join(__dirname, '../../../fixtures/root-reverted.txt'),
       'utf8'
     );
     const reverted = revertTreeString(rootText);
@@ -35,11 +35,11 @@ suite('Extension Tests', function () {
   // https://github.com/aprilandjan/ascii-tree-generator/pull/11
   test('revert more-depth tree string to text', function () {
     const origin = fs.readFileSync(
-      path.join(__dirname, '../../fixtures/more-depth-reverted.txt'),
+      path.join(__dirname, '../../../fixtures/more-depth-reverted.txt'),
       'utf8'
     );
     const treeString = fs.readFileSync(
-      path.join(__dirname, '../../fixtures/more-depth.txt'),
+      path.join(__dirname, '../../../fixtures/more-depth.txt'),
       'utf8'
     );
     const reverted = revertTreeString(treeString);

src/test/suite/index.ts

@@ -6,6 +6,7 @@ export function run(): Promise<void> {
   // Create the mocha test
   const mocha = new Mocha({
     ui: 'tdd',
+    color: true,
   });
 
   const testsRoot = path.resolve(__dirname, '..');
@@ -29,6 +30,7 @@ export function run(): Promise<void> {
           }
         });
       } catch (err) {
+        console.error(err);
         e(err);
       }
     });

src/test/suite/lib/directory.test.ts

@@ -22,7 +22,7 @@ function findFileByName(files: IFileStat[] = [], name: string) {
 suite('lib/directory functions', function () {
   this.timeout(120000);
 
-  const rootDir: string = path.resolve(__dirname, '../../../fixtures/root');
+  const rootDir: string = path.resolve(__dirname, '../../../../fixtures/root');
 
   test('should correctly list directory', async () => {
     const files = await listDirectory(rootDir);

src/test/suite/lib/generator.test.ts

@@ -11,17 +11,17 @@ suite('lib/generator functions', function () {
   this.timeout(120000);
   // Enable test mode to override user defined chars with defaults
   setTestMode();
-  const rootDir: string = path.resolve(__dirname, '../../../fixtures/root');
+  const rootDir: string = path.resolve(__dirname, '../../../../fixtures/root');
   const rootText = fs.readFileSync(
-    path.join(__dirname, '../../../fixtures/root.txt'),
+    path.join(__dirname, '../../../../fixtures/root.txt'),
     'utf8'
   );
   const rootSorted = fs.readFileSync(
-    path.join(__dirname, '../../../fixtures/root-sorted.txt'),
+    path.join(__dirname, '../../../../fixtures/root-sorted.txt'),
     'utf8'
   );
   const rootFillLeft = fs.readFileSync(
-    path.join(__dirname, '../../../fixtures/root-fill-left.txt'),
+    path.join(__dirname, '../../../../fixtures/root-fill-left.txt'),
     'utf8'
   );
 
@@ -36,7 +36,7 @@ suite('lib/generator functions', function () {
 
   test('should correctly generate tree from hash text', () => {
     const text = fs.readFileSync(
-      path.join(__dirname, '../../../fixtures/hash.txt'),
+      path.join(__dirname, '../../../../fixtures/hash.txt'),
       'utf8'
     );
     const items = formatFileTreeItemsFromText(text);
@@ -46,7 +46,7 @@ suite('lib/generator functions', function () {
 
   test('should correctly generate tree from indent text', () => {
     const text = fs.readFileSync(
-      path.join(__dirname, '../../../fixtures/indent.txt'),
+      path.join(__dirname, '../../../../fixtures/indent.txt'),
       'utf8'
     );
     const items = formatFileTreeItemsFromText(text);
@@ -56,7 +56,7 @@ suite('lib/generator functions', function () {
 
   test('should correctly generate tree from hash-indented text if fill-left', () => {
     const text = fs.readFileSync(
-      path.join(__dirname, '../../../fixtures/hash-indented.txt'),
+      path.join(__dirname, '../../../../fixtures/hash-indented.txt'),
       'utf8'
     );
     const items = formatFileTreeItemsFromText(text);
@@ -66,7 +66,7 @@ suite('lib/generator functions', function () {
 
   test('should correctly generate tree from hash-indented text if not fill-left', () => {
     const text = fs.readFileSync(
-      path.join(__dirname, '../../../fixtures/hash-indented.txt'),
+      path.join(__dirname, '../../../../fixtures/hash-indented.txt'),
       'utf8'
     );
     const items = formatFileTreeItemsFromText(text);