refactor: remove shelljs from tests

package.json

@@ -68,7 +68,6 @@
     "proxyquire": "^2.1.0",
     "semantic-release": "15.13.18",
     "semver": "6.2.0",
-    "shelljs": "0.7.6",
     "sinon": "^6.3.4",
     "uuid": "3.3.2"
   },

src/commitizen/adapter.js

@@ -42,7 +42,7 @@ function addPathToAdapterConfig (cliPath, repoPath, adapterNpmName) {
     }
   };
 
-  let packageJsonPath = path.join(getNearestProjectRootDirectory(), 'package.json');
+  let packageJsonPath = path.join(getNearestProjectRootDirectory(repoPath), 'package.json');
   let packageJsonString = fs.readFileSync(packageJsonPath, 'utf-8');
   // tries to detect the indentation and falls back to a default if it can't
   let indent = detectIndent(packageJsonString).indent || '  ';
@@ -111,8 +111,8 @@ function getNearestNodeModulesDirectory (options) {
 /**
  * Gets the nearest project root directory
  */
-function getNearestProjectRootDirectory (options) {
-  return path.join(process.cwd(), getNearestNodeModulesDirectory(options), '/../');
+function getNearestProjectRootDirectory (repoPath, options) {
+  return path.join(repoPath, getNearestNodeModulesDirectory(options), '/../');
 }
 
 /**

src/commitizen/init.js

@@ -63,7 +63,7 @@ function init (repoPath, adapterNpmName, {
   checkRequiredArguments(repoPath, adapterNpmName);
 
   // Load the current adapter config
-  let adapterConfig = loadAdapterConfig();
+  let adapterConfig = loadAdapterConfig(repoPath);
 
   // Get the npm string mappings based on the arguments provided
   let stringMappings = yarn ? getYarnAddStringMappings(dev, exact, force) : getNpmInstallStringMappings(save, saveDev, saveExact, force);
@@ -112,8 +112,8 @@ function checkRequiredArguments (path, adapterNpmName) {
  * CONFIG
  * Loads and returns the adapter config at key config.commitizen, if it exists
  */
-function loadAdapterConfig () {
-  let config = configLoader.load();
+function loadAdapterConfig (cwd) {
+  let config = configLoader.load(null, cwd);
   if (config) {
     return config;
   } else {

src/commitizen/staging.js

@@ -8,7 +8,7 @@ export { isClean };
 function isClean (repoPath, done) {
   exec('git diff --no-ext-diff --name-only && git diff --no-ext-diff --cached --name-only', {
     maxBuffer: Infinity,
-    cwd: repoPath || process.cwd()
+    cwd: repoPath
   }, function (error, stdout) {
     if (error) {
       return done(error);

src/configLoader/loader.js

@@ -14,12 +14,12 @@ export default loader;
 /**
  * Get content of the configuration file
  * @param {String} config - partial path to configuration file
- * @param {String} [cwd = process.cwd()] - directory path which will be joined with config argument
+ * @param {String} cwd - directory path which will be joined with config argument
  * @return {Object|undefined}
  */
 function loader (configs, config, cwd) {
     var content;
-    var directory = cwd || process.cwd();
+    var directory = cwd;
 
     // If config option is given, attempt to load it
     if (config) {

test/config.js

@@ -33,12 +33,6 @@ let config = {
    */
   maxTimeout: 240000,
 
-  /**
-   * Whether shelljs should suppress output, should be true
-   * unless debugging.
-   */
-  silent: true,
-
   /**
    * Whether or not to keep the artifacts of the tests after
    * they've run.

test/tester.js

@@ -3,21 +3,16 @@ import * as clean from './tools/clean';
 import * as files from './tools/files';
 import * as util from '../src/common/util';
 import { config as userConfig } from './config';
-import * as sh from 'shelljs'; // local instance
 import _ from 'lodash';
 
 // Clone the user's config so we don't get caught w/our pants down
 let patchedConfig = _.cloneDeep(userConfig);
 
 function bootstrap () {
 
-  // Patch any shelljs specific config settings
-  sh.config.silent = patchedConfig.silent || true;
-
-  // Return the patched config and shelljs instance
+  // Return the patched config
   return {
     config: patchedConfig,
-    sh,
     repo,
     clean,
     util,

test/tests/adapter.js

@@ -12,16 +12,16 @@ import { isFunction } from '../../src/common/util';
 import { bootstrap } from '../tester';
 
 // Destructure some things based on the bootstrap process
-let { config, sh, repo, clean } = bootstrap();
+let { config, repo, clean } = bootstrap();
 
 before(function () {
   // Creates the temp path
-  clean.before(sh, config.paths.tmp);
+  clean.before(config.paths.tmp);
 });
 
 beforeEach(function () {
   this.timeout(config.maxTimeout); // this could take a while
-  repo.createEndUser(sh, config.paths.endUserRepo);
+  repo.createEndUser(config.paths.endUserRepo);
 });
 
 describe('adapter', function () {
@@ -180,12 +180,12 @@ describe('adapter', function () {
 afterEach(function () {
   this.timeout(config.maxTimeout); // this could take a while
   // All this should do is archive the tmp path to the artifacts
-  clean.afterEach(sh, config.paths.tmp, config.preserve);
+  clean.afterEach(config.paths.tmp, config.preserve);
 });
 
 after(function () {
   this.timeout(config.maxTimeout); // this could take a while
   // Once everything is done, the artifacts should be cleaned up based on
   // the preserve setting in the config
-  clean.after(sh, config.paths.tmp, config.preserve);
+  clean.after(config.paths.tmp, config.preserve);
 });

test/tests/commit.js

@@ -13,18 +13,18 @@ import { addFile as gitAddFile, init as gitInit, log, whatChanged } from '../../
 import { commit as commitizenCommit, init as commitizenInit } from '../../src/commitizen';
 
 // Destructure some things for cleaner tests
-let { config, sh, repo, clean, files } = bootstrap();
+let { config, repo, clean, files } = bootstrap();
 let { writeFilesToPath } = files;
 
 before(function () {
   // Creates the temp path
-  clean.before(sh, config.paths.tmp);
+  clean.before(config.paths.tmp);
 });
 
 beforeEach(function () {
   this.timeout(config.maxTimeout); // this could take a while
   /* istanbul ignore next */
-  repo.createEndUser(sh, config.paths.endUserRepo);
+  repo.createEndUser(config.paths.endUserRepo);
 });
 
 describe('commit', function () {
@@ -316,14 +316,14 @@ ${(os.platform === 'win32') ? '' : '    '}
 afterEach(function () {
   this.timeout(config.maxTimeout); // this could take a while
   // All this should do is archive the tmp path to the artifacts
-  clean.afterEach(sh, config.paths.tmp, config.preserve);
+  clean.afterEach(config.paths.tmp, config.preserve);
 });
 
 after(function () {
   this.timeout(config.maxTimeout); // this could take a while
   // Once everything is done, the artifacts should be cleaned up based on
   // the preserve setting in the config
-  clean.after(sh, config.paths.tmp, config.preserve);
+  clean.after(config.paths.tmp, config.preserve);
 });
 
 /**

test/tests/init.js

@@ -10,16 +10,16 @@ import { init as commitizenInit } from '../../src/commitizen';
 import { bootstrap } from '../tester';
 
 // Destructure some things based on the bootstrap process
-let { config, sh, repo, clean, util } = bootstrap();
+let { config, repo, clean, util } = bootstrap();
 
 before(function () {
   // Creates the temp path
-  clean.before(sh, config.paths.tmp);
+  clean.before(config.paths.tmp);
 });
 
 beforeEach(function () {
   this.timeout(config.maxTimeout); // this could take a while
-  repo.createEndUser(sh, config.paths.endUserRepo);
+  repo.createEndUser(config.paths.endUserRepo);
 });
 
 describe('init', function () {
@@ -65,11 +65,9 @@ describe('init', function () {
     // SETUP
 
     // Add a first adapter
-    sh.cd(config.paths.endUserRepo);
     commitizenInit(config.paths.endUserRepo, 'cz-conventional-changelog', { saveDev: true });
 
     // TEST
-    sh.cd(config.paths.endUserRepo);
     // Adding a second adapter
     expect(function () {
       commitizenInit(config.paths.endUserRepo, 'cz-jira-smart-commit', { saveDev: true });
@@ -90,7 +88,6 @@ describe('init', function () {
     // SETUP
 
     // Add a first adapter
-    sh.cd(config.paths.endUserRepo);
     commitizenInit(config.paths.endUserRepo, 'cz-conventional-changelog', { saveDev: true });
 
     // TEST
@@ -113,7 +110,6 @@ describe('init', function () {
     // SETUP
 
     // Add a first adapter
-    sh.cd(config.paths.endUserRepo);
     commitizenInit(config.paths.endUserRepo, 'cz-conventional-changelog');
     let packageJson = util.getParsedPackageJsonFromPath(config.paths.endUserRepo);
 
@@ -139,7 +135,6 @@ describe('init', function () {
     // SETUP
 
     // Add a first adapter
-    sh.cd(config.paths.endUserRepo);
     commitizenInit(config.paths.endUserRepo, 'cz-conventional-changelog', { saveExact: true });
     let packageJson = util.getParsedPackageJsonFromPath(config.paths.endUserRepo);
 
@@ -162,7 +157,6 @@ describe('init', function () {
     // SETUP
 
     // Add a first adapter
-    sh.cd(config.paths.endUserRepo);
     commitizenInit(config.paths.endUserRepo, 'cz-conventional-changelog', { includeCommitizen: true });
     let packageJson = util.getParsedPackageJsonFromPath(config.paths.endUserRepo);
 
@@ -220,11 +214,9 @@ describe('init', function () {
     // SETUP
 
     // Add a first adapter
-    sh.cd(config.paths.endUserRepo);
     commitizenInit(config.paths.endUserRepo, 'cz-conventional-changelog', { yarn: true, dev: true });
 
     // TEST
-    sh.cd(config.paths.endUserRepo);
     // Adding a second adapter
     expect(function () {
       commitizenInit(config.paths.endUserRepo, 'cz-jira-smart-commit', { yarn: true, dev: true });
@@ -245,7 +237,6 @@ describe('init', function () {
     // SETUP
 
     // Add a first adapter
-    sh.cd(config.paths.endUserRepo);
     commitizenInit(config.paths.endUserRepo, 'cz-conventional-changelog', { yarn: true, dev: true });
 
     // TEST
@@ -268,7 +259,6 @@ describe('init', function () {
     // SETUP
 
     // Add a first adapter
-    sh.cd(config.paths.endUserRepo);
     commitizenInit(config.paths.endUserRepo, 'cz-conventional-changelog', { yarn: true, dev: true });
     let packageJson = util.getParsedPackageJsonFromPath(config.paths.endUserRepo);
 
@@ -294,7 +284,6 @@ describe('init', function () {
     // SETUP
 
     // Add a first adapter
-    sh.cd(config.paths.endUserRepo);
     commitizenInit(config.paths.endUserRepo, 'cz-conventional-changelog', { yarn: true, dev: true, exact: true });
     let packageJson = util.getParsedPackageJsonFromPath(config.paths.endUserRepo);
 
@@ -315,12 +304,12 @@ describe('init', function () {
 afterEach(function () {
   this.timeout(config.maxTimeout); // this could take a while
   // All this should do is archive the tmp path to the artifacts
-  clean.afterEach(sh, config.paths.tmp, config.preserve);
+  clean.afterEach(config.paths.tmp, config.preserve);
 });
 
 after(function () {
   this.timeout(config.maxTimeout); // this could take a while
   // Once everything is done, the artifacts should be cleaned up based on
   // the preserve setting in the config
-  clean.after(sh, config.paths.tmp, config.preserve);
+  clean.after(config.paths.tmp, config.preserve);
 });

test/tests/staging.js

@@ -8,17 +8,17 @@ import { init as gitInit, addPath as gitAdd } from '../../src/git';
 import { staging } from '../../src/commitizen';
 
 // Destructure some things for cleaner tests
-let { config, sh, repo, clean, files } = bootstrap();
+let { config, repo, clean, files } = bootstrap();
 let { writeFilesToPath } = files;
 
 before(function () {
   // Creates the temp path
-  clean.before(sh, config.paths.tmp);
+  clean.before(config.paths.tmp);
 });
 
 beforeEach(function () {
   this.timeout(config.maxTimeout); // this could take a while
-  repo.createEndUser(sh, config.paths.endUserRepo);
+  repo.createEndUser(config.paths.endUserRepo);
 });
 
 describe('staging', function () {
@@ -83,12 +83,12 @@ describe('staging', function () {
 afterEach(function () {
   this.timeout(config.maxTimeout); // this could take a while
   // All this should do is archive the tmp path to the artifacts
-  clean.afterEach(sh, config.paths.tmp, config.preserve);
+  clean.afterEach(config.paths.tmp, config.preserve);
 });
 
 after(function () {
   this.timeout(config.maxTimeout); // this could take a while
   // Once everything is done, the artifacts should be cleaned up based on
   // the preserve setting in the config
-  clean.after(sh, config.paths.tmp, config.preserve);
+  clean.after(config.paths.tmp, config.preserve);
 });