fix bit-javascript unit tests (teambit#2634)

* fix many tests

* fix path and remove many ts-ignore

* fix file paths calculation for dependency tree

* add !fixtures/filing-cabinet/node_modules to avoid git ignoring it. 

* fix lint issues

Co-authored-by: David First <[email protected]>

Author: GiladShoham

.gitignore

@@ -29,6 +29,7 @@ build/Release
 # Dependency directories
 node_modules
 jspm_packages
+!fixtures/filing-cabinet/node_modules
 
 # Optional npm cache directory
 .npm

fixtures/filing-cabinet/node_modules/bootstrap/index.scss

@@ -2,73 +2,62 @@ import path from 'path';
 import { expect } from 'chai';
 import * as buildTree from './build-tree';
 
-const fixtures = `${__dirname}/../../fixtures`;
+const fixtures = `${__dirname}/../../../../../fixtures`;
 const precinctFixtures = path.join(fixtures, 'precinct');
 const buildTreeFixtures = path.join(fixtures, 'build-tree');
 
 describe('buildTree', () => {
   describe('getDependencyTree', () => {
+    const filePaths: string[] = [];
+    let visited: any;
     const dependencyTreeParams = {
       baseDir: '.',
       workspacePath: __dirname,
-      filePaths: [],
+      filePaths,
       bindingPrefix: '@bit',
+      visited,
       resolveModulesConfig: undefined
     };
     it('when no files are passed should return an empty tree', async () => {
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       const results = await buildTree.getDependencyTree(dependencyTreeParams);
       expect(results).to.deep.equal({ tree: {} });
     });
     it('when unsupported files are passed should return them with no dependencies', async () => {
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       dependencyTreeParams.filePaths = [`${fixtures}/unsupported-file.pdf`];
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       const results = await buildTree.getDependencyTree(dependencyTreeParams);
       expect(results.tree).to.deep.equal({ 'fixtures/unsupported-file.pdf': {} });
     });
     it('when supported and unsupported files are passed should return them all', async () => {
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       dependencyTreeParams.filePaths = [`${fixtures}/unsupported-file.pdf`, `${precinctFixtures}/es6.js`];
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       const results = await buildTree.getDependencyTree(dependencyTreeParams);
       expect(results.tree).to.have.property('fixtures/unsupported-file.pdf');
       expect(results.tree).to.have.property('fixtures/precinct/es6.js');
     });
     it('when a js file has parsing error it should add the file to the tree with the error instance', async () => {
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       dependencyTreeParams.filePaths = [`${precinctFixtures}/unparseable.js`];
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       const results = await buildTree.getDependencyTree(dependencyTreeParams);
       const unParsedFile = 'fixtures/precinct/unparseable.js';
       expect(results.tree).to.have.property(unParsedFile);
       expect(results.tree[unParsedFile]).to.have.property('error');
       expect(results.tree[unParsedFile].error).to.be.instanceof(Error);
     });
     it('when a js file has parsing error and it retrieved from the cache it should add the file to the tree with the error instance', async () => {
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       dependencyTreeParams.filePaths = [`${precinctFixtures}/unparseable.js`];
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       dependencyTreeParams.visited = {};
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       const results = await buildTree.getDependencyTree(dependencyTreeParams);
       const unParsedFile = 'fixtures/precinct/unparseable.js';
       expect(results.tree).to.have.property(unParsedFile);
       expect(results.tree[unParsedFile]).to.have.property('error');
       expect(results.tree[unParsedFile].error).to.be.instanceof(Error);
 
       // second time, this time it fetches from the cache (visited object)
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       const resultsCached = await buildTree.getDependencyTree(dependencyTreeParams);
       expect(resultsCached.tree).to.have.property(unParsedFile);
       expect(resultsCached.tree[unParsedFile]).to.have.property('error');
       expect(resultsCached.tree[unParsedFile].error).to.be.instanceof(Error);
     });
     it.skip('when a css file has parsing error it should add the file to the tree with the error instance', async () => {
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       dependencyTreeParams.filePaths = [`${buildTreeFixtures}/unparsed.css`];
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       const results = await buildTree.getDependencyTree(dependencyTreeParams);
       const unParsedFile = 'fixtures/build-tree/unparsed.css';
       expect(results.tree).to.have.property(unParsedFile);
@@ -78,10 +67,7 @@ describe('buildTree', () => {
     describe('when a dependency of dependency has parsing error', () => {
       let results;
       before(async () => {
-        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
         dependencyTreeParams.filePaths = [`${buildTreeFixtures}/a.js`, `${buildTreeFixtures}/b.js`];
-        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
         results = await buildTree.getDependencyTree(dependencyTreeParams);
       });
       it('should add all the files to the tree', async () => {
@@ -102,9 +88,7 @@ describe('buildTree', () => {
       let results;
       const missingDepsFile = 'fixtures/missing-deps.js';
       before(async () => {
-        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
         dependencyTreeParams.filePaths = [`${fixtures}/missing-deps.js`];
-        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
         results = await buildTree.getDependencyTree(dependencyTreeParams);
         expect(results.tree).to.have.property(missingDepsFile);
         expect(results.tree[missingDepsFile]).to.have.property('missing');
@@ -122,9 +106,7 @@ describe('buildTree', () => {
       describe('when a file imports from itself', () => {
         let results;
         before(async () => {
-          // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
           dependencyTreeParams.filePaths = [`${buildTreeFixtures}/tree-shaking-cycle/self-cycle.js`];
-          // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
           results = await buildTree.getDependencyTree(dependencyTreeParams);
         });
         it('should not throw an error and should remove itself from the dependencies files', () => {
@@ -135,9 +117,7 @@ describe('buildTree', () => {
       describe('cycle with multiple files', () => {
         let results;
         before(async () => {
-          // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
           dependencyTreeParams.filePaths = [`${buildTreeFixtures}/tree-shaking-cycle/foo.js`];
-          // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
           results = await buildTree.getDependencyTree(dependencyTreeParams);
         });
         it('should not recognize the cycle dependencies as link files', () => {
@@ -155,9 +135,7 @@ describe('buildTree', () => {
     describe('fileA imports varX from fileB, fileB imports varX from fileC but not export it', () => {
       let results;
       before(async () => {
-        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
         dependencyTreeParams.filePaths = [`${buildTreeFixtures}/not-link-file/file-a.js`];
-        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
         results = await buildTree.getDependencyTree(dependencyTreeParams);
       });
       it('should not mark fileB as a link file', () => {

src/consumer/component/dependencies/files-dependency-builder/build-tree.spec.ts

@@ -445,7 +445,7 @@ export async function getDependencyTree({
     if (filePath.startsWith(baseDir)) {
       return filePath;
     }
-    return path.join(baseDir, filePath);
+    return path.resolve(baseDir, filePath);
   });
   // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
   const { madgeTree, skipped, pathMap, errors } = generateTree(fullPaths, config);

src/consumer/component/dependencies/files-dependency-builder/build-tree.ts

@@ -1,12 +1,12 @@
 import assert from 'assert';
 import sinon from 'sinon';
-import mockfs from 'mock-fs';
 import path from 'path';
+import mockfs from 'mock-fs';
 import rewire from 'rewire';
+import Config from './Config';
+import precinct from '../precinct';
 
 const expect = require('chai').expect;
-const precinct = require('../precinct');
-const Config = require('./Config');
 
 // needed for the lazy loading.
 require('module-definition');
@@ -16,10 +16,18 @@ require('../../../../../utils');
 require('../../../../../utils/is-relative-import');
 require('../detectives/detective-css-and-preprocessors');
 require('../detectives/detective-typescript');
+require('../detectives/detective-css');
+require('../detectives/detective-sass');
+require('../detectives/detective-scss');
+require('../detectives/detective-less');
 require('../detectives/parser-helper');
+require('../dependency-tree/Config');
+require('../precinct');
+require('../filing-cabinet');
 
-const dependencyTree = rewire('./');
-const fixtures = path.resolve(`${__dirname}/../../../fixtures/dependency-tree`);
+const dependencyTreeRewired = rewire('./');
+const dependencyTree = dependencyTreeRewired.default;
+const fixtures = path.resolve(`${__dirname}/../../../../../../fixtures/dependency-tree`);
 
 describe('dependencyTree', function() {
   this.timeout(8000);
@@ -187,14 +195,14 @@ describe('dependencyTree', function() {
     const directory = `${__dirname}/cyclic`;
     const filename = path.normalize(`${directory}/a.js`);
 
-    const spy = sinon.spy(dependencyTree, '_getDependencies');
+    const spy = sinon.spy(dependencyTreeRewired, '_getDependencies');
 
-    const tree = dependencyTree({ filename, directory });
+    const tree = dependencyTreeRewired.default({ filename, directory });
 
     assert(spy.callCount === 2);
     assert(Object.keys(tree[filename]).length);
 
-    dependencyTree._getDependencies.restore();
+    dependencyTreeRewired._getDependencies.restore();
   });
 
   it('excludes Nodejs core modules by default', () => {
@@ -337,7 +345,7 @@ describe('dependencyTree', function() {
       // @ts-ignore
       this._directory = `${fixtures}/commonjs`;
       // @ts-ignore
-      this._revert = dependencyTree.__set__('traverse', () => []);
+      this._revert = dependencyTreeRewired.__set__('traverse', () => []);
     });
 
     afterEach(() => {
@@ -413,11 +421,11 @@ describe('dependencyTree', function() {
   describe('memoization (#2)', () => {
     beforeEach(() => {
       // @ts-ignore
-      this._spy = sinon.spy(dependencyTree, '_getDependencies');
+      this._spy = sinon.spy(dependencyTreeRewired, '_getDependencies');
     });
 
     afterEach(() => {
-      dependencyTree._getDependencies.restore();
+      dependencyTreeRewired._getDependencies.restore();
     });
 
     it('accepts a cache object for memoization (#2)', () => {

src/consumer/component/dependencies/files-dependency-builder/dependency-tree/index.spec.ts

@@ -3,9 +3,9 @@
  */
 
 import { expect } from 'chai';
+import detective from './';
 
 const assert = require('assert');
-const detective = require('./');
 
 describe('detective-es6', () => {
   const ast = {
@@ -97,6 +97,7 @@ describe('detective-es6', () => {
   it('throws when content is not provided', function() {
     assert.throws(
       function() {
+        // @ts-ignore
         detective();
       },
       Error,
@@ -132,44 +133,55 @@ describe('detective-es6', () => {
     it('should recognize default imports as default', () => {
       const deps = detective('import foo from "foo";');
       expect(deps).to.have.property('foo');
+      // @ts-ignore
       expect(deps.foo).to.have.property('importSpecifiers');
+      // @ts-ignore
       const importSpecifier = deps.foo.importSpecifiers[0];
       expect(importSpecifier.name).to.equal('foo');
       expect(importSpecifier.isDefault).to.be.true;
     });
     it('should recognize non-default imports as non-default', () => {
       const deps = detective('import { foo } from "foo";');
       expect(deps).to.have.property('foo');
+      // @ts-ignore
       expect(deps.foo).to.have.property('importSpecifiers');
+      // @ts-ignore
       const importSpecifier = deps.foo.importSpecifiers[0];
       expect(importSpecifier.name).to.equal('foo');
       expect(importSpecifier.isDefault).to.be.false;
     });
     it('should support export-default-as syntax', () => {
       const deps = detective('export { default as foo } from "foo";');
       expect(deps).to.have.property('foo');
+      // @ts-ignore
       expect(deps.foo).to.have.property('importSpecifiers');
+      // @ts-ignore
       const importSpecifier = deps.foo.importSpecifiers[0];
       expect(importSpecifier.name).to.equal('foo');
       expect(importSpecifier.isDefault).to.be.true;
     });
     it('should not be supported for CommonJS', () => {
       const deps = detective('const foo = require("foo");');
       expect(deps).to.have.property('foo');
+      // @ts-ignore
       expect(deps.foo).to.not.have.property('importSpecifiers');
     });
     it('should add "exported": true if the same variable has been imported and exported', () => {
       const deps = detective('import { foo } from "foo"; export default foo;');
       expect(deps).to.have.property('foo');
+      // @ts-ignore
       expect(deps.foo).to.have.property('importSpecifiers');
+      // @ts-ignore
       const importSpecifier = deps.foo.importSpecifiers[0];
       expect(importSpecifier.name).to.equal('foo');
       expect(importSpecifier.exported).to.be.true;
     });
     it('should not add "exported" property if the variable has been imported but not exported', () => {
       const deps = detective('import { foo } from "foo";');
       expect(deps).to.have.property('foo');
+      // @ts-ignore
       expect(deps.foo).to.have.property('importSpecifiers');
+      // @ts-ignore
       const importSpecifier = deps.foo.importSpecifiers[0];
       expect(importSpecifier.name).to.equal('foo');
       expect(importSpecifier).to.not.have.property('exported');