test: remove python2 support in tests

Author: owl-from-hogvarts

test/test-find-python-script.js

@@ -8,23 +8,22 @@ const path = require('path')
 
 require('npmlog').level = 'warn'
 
-//* can use name as short descriptions
+//* name can be used as short descriptions
 
 /**
  * @typedef Check
- * @property {string} path - path to execurtable or command
+ * @property {string} path - path to executable or command
  * @property {string} name - very little description
  */
 
+// TODO: add symlinks to python which will contain utf-8 chars
 /**
  * @type {Check[]}
  */
 const checks = [
   { path: process.env.PYTHON, name: 'env var PYTHON' },
-  { path: process.env.python2, name: 'env var python2' },
   { path: 'python3', name: 'python3 in PATH' },
-  { path: 'python2', name: 'python2 in PATH' },
-  { path: 'python', name: 'pyhton in PATH' }
+  { path: 'python', name: 'python in PATH' }
 ]
 const args = [path.resolve('./lib/find-python-script.py')]
 const options = {
@@ -34,15 +33,15 @@ const options = {
 /**
   Getting output from find-python-script.py,
   compare it to path provided to terminal.
-  If equale - test pass
+  If equals - test pass
 
   runs for all checks
 
   @private
   @argument {Error} err - exec error
   @argument {string} stdout - stdout buffer of child process
   @argument {string} stderr
-  @this {{t, exec: Check}}
+  @this {{t: Tap, exec: Check}}
  */
 function check (err, stdout, stderr) {
   const { t, exec } = this
@@ -64,6 +63,7 @@ function check (err, stdout, stderr) {
 test('find-python-script', { buffered: false }, (t) => {
   t.plan(checks.length)
 
+  //? may be more elegant way to copy and pass context
   // context for check functions
   const ctx = {
     t: t,
@@ -74,7 +74,7 @@ test('find-python-script', { buffered: false }, (t) => {
     // checking if env var exist
     if (!(exec.path === undefined || exec.path === null)) {
       ctx.exec = exec
-      // passing ctx as coppied object to make properties immutable from here
+      // passing ctx as copied object to make properties immutable from here
       const boundedCheck = check.bind(Object.assign({}, ctx))
       execFile(exec.path, args, options, boundedCheck)
     } else {

test/test-find-python.js

@@ -8,27 +8,27 @@ const PythonFinder = findPython.test.PythonFinder
 const npmlog = require('npmlog')
 npmlog.level = 'silent'
 
-// what chould final error message displayed in terminal contain
+// what final error message displayed in terminal should contain
 const finalErrorMessage = 'Could not find any Python'
 
-//! dont forget manually call pythonFinderInstance.findPython()
+//! don't forget manually call pythonFinderInstance.findPython()
 
-// String emmulating path coomand or anything else with spaces
-// and UTF-8 charcters.
+// String emulating path command or anything else with spaces
+// and UTF-8 characters.
 // Is returned by execFile
 //! USE FOR ALL STRINGS
 const testString = 'python one love♥'
 const testVersions = {
   outdated: '2.0.0',
-  normal: '3.7.0',
-  testError: new Error('test error')
+  normal: '3.9.0',
+  testError: new Error('test error'),
 }
 
 /**
  * @typedef OptionsObj
- * @property {boolean} shouldProduceError
+ * @property {boolean} shouldProduceError pass test error to callback
  * @property {boolean} checkingPyLauncher
- * @property {boolean} isPythonOutdated
+ * @property {boolean} isPythonOutdated return outdated version
  * @property {boolean} checkingWinDefaultPathes
  *
  */
@@ -37,12 +37,12 @@ const testVersions = {
  *
  * @param {OptionsObj} optionsObj
  */
-function TestExecFile (optionsObj) {
+function TestExecFile(optionsObj) {
   /**
    *
    * @this {PythonFinder}
    */
-  return function testExecFile (exec, args, options, callback) {
+  return function testExecFile(exec, args, options, callback) {
     if (!(optionsObj ? optionsObj.shouldProduceError : false)) {
       if (args === this.argsVersion) {
         if (optionsObj ? optionsObj.checkingWinDefaultPathes : false) {
@@ -56,9 +56,14 @@ function TestExecFile (optionsObj) {
         } else {
           callback(null, testVersions.normal, null)
         }
-      } else if (args === this.win ? `"${this.argsExecutable}"` : this.argsExecutable) {
+      } else if (
+        args === this.win ? `"${this.argsExecutable}"` : this.argsExecutable
+      ) {
         if (optionsObj ? optionsObj.checkingPyLauncher : false) {
-          if (exec === 'py.exe' || exec === (this.win ? '"python"' : 'python')) {
+          if (
+            exec === 'py.exe' ||
+            exec === (this.win ? '"python"' : 'python')
+          ) {
             callback(null, testString, null)
           } else {
             callback(new Error('not found'))
@@ -85,7 +90,7 @@ are: ${args};\n\nValid are: \n${this.argsExecutable}\n${this.argsVersion}`
 
 /**
  *
- * @param {boolean} isPythonOutdated if true will return outadet version of python
+ * @param {boolean} isPythonOutdated if true will return outdated version of python
  * @param {OptionsObj} optionsObj
  */
 
@@ -110,7 +115,7 @@ test('new-find-python', { buffered: true }, (t) => {
     t.test('outdated version of python found', (t) => {
       const pythonFinderInstance = new PythonFinder(null, (err, path) => {
         if (!err) {
-          t.fail("mustn't return path of outdated")
+          t.fail("mustn't return path for outdated version")
         } else {
           t.end()
         }
@@ -128,13 +133,13 @@ test('new-find-python', { buffered: true }, (t) => {
       })
 
       pythonFinderInstance.execFile = TestExecFile({
-        shouldProduceError: true
+        shouldProduceError: true,
       })
 
       pythonFinderInstance.findPython()
     })
 
-    t.test('no python2, no python, unix', (t) => {
+    t.test('no python, unix', (t) => {
       const pythonFinderInstance = new PythonFinder(null, (err, path) => {
         t.false(path)
 
@@ -147,7 +152,7 @@ test('new-find-python', { buffered: true }, (t) => {
       pythonFinderInstance.checkPyLauncher = t.fail
 
       pythonFinderInstance.execFile = TestExecFile({
-        shouldProduceError: true
+        shouldProduceError: true,
       })
 
       pythonFinderInstance.findPython()
@@ -165,24 +170,29 @@ test('new-find-python', { buffered: true }, (t) => {
       pythonFinderInstance.win = true
 
       pythonFinderInstance.execFile = TestExecFile({
-        checkingPyLauncher: true
+        checkingPyLauncher: true,
       })
 
       pythonFinderInstance.findPython()
     })
 
-    t.test('no python, no python launcher, checking win default locations', (t) => {
-      const pythonFinderInstance = new PythonFinder(null, (err, path) => {
-        t.strictEqual(err, null)
-        t.true(pythonFinderInstance.winDefaultLocations.includes(path))
-        t.end()
-      })
+    t.test(
+      'no python, no python launcher, checking win default locations',
+      (t) => {
+        const pythonFinderInstance = new PythonFinder(null, (err, path) => {
+          t.strictEqual(err, null)
+          t.true(pythonFinderInstance.winDefaultLocations.includes(path))
+          t.end()
+        })
 
-      pythonFinderInstance.win = true
+        pythonFinderInstance.win = true
 
-      pythonFinderInstance.execFile = TestExecFile({ checkingWinDefaultPathes: true })
-      pythonFinderInstance.findPython()
-    })
+        pythonFinderInstance.execFile = TestExecFile({
+          checkingWinDefaultPathes: true,
+        })
+        pythonFinderInstance.findPython()
+      }
+    )
 
     t.test('python is setted from config', (t) => {
       const pythonFinderInstance = new PythonFinder(testString, (err, path) => {
@@ -202,6 +212,7 @@ test('new-find-python', { buffered: true }, (t) => {
     t.end()
   })
 
+  // TODO: make symlink to python with utf-8 chars
   t.test('real testing (trying to find real python exec)', (t) => {
     const pythonFinderInstance = new PythonFinder(null, (err, path) => {
       t.strictEqual(err, null)
@@ -211,13 +222,8 @@ test('new-find-python', { buffered: true }, (t) => {
         console.log('stdout:' + stdout)
         console.log('stderr:' + stderr)
 
-        if (stderr.includes('Python 2')) {
-          t.strictEqual(stdout, '')
-          t.ok(stderr.includes('Python 2'))
-        } else {
-          t.ok(stdout.includes('Python 3'))
-          t.strictEqual(stderr, '')
-        }
+        t.ok(stdout.includes('Python 3'))
+        t.strictEqual(stderr, '')
 
         t.end()
       })