refactor(tests): move supporting functions to utils folder

This commit is contained in:
zkochan
2017-02-06 02:11:22 +02:00
parent b2decbeced
commit 04bc56c688
16 changed files with 42 additions and 25 deletions

View File

@@ -3,8 +3,7 @@ import promisifyTape from 'tape-promise'
import fs = require('mz/fs')
import mkdirp = require('mkdirp')
import path = require('path')
import prepare from './support/prepare'
import testDefaults from './support/testDefaults'
import {prepare, testDefaults} from './utils'
import {installPkgs} from '../src'
const test = promisifyTape(tape)

View File

@@ -1,11 +1,9 @@
import {installPkgs, install} from '../src'
import {add as addDistTag} from './support/distTags'
import testDefaults from './support/testDefaults'
import {prepare, addDistTag, testDefaults} from './utils'
import tape = require('tape')
import promisifyTape from 'tape-promise'
import exists = require('exists-file')
import path = require('path')
import prepare from './support/prepare'
const test = promisifyTape(tape)

View File

@@ -4,9 +4,12 @@ import promisifyTape from 'tape-promise'
const test = promisifyTape(tape)
import spawn = require('cross-spawn')
import exists = require('exists-file')
import {add as addDistTag} from './support/distTags'
import prepare from './support/prepare'
import execPnpm, {sync as execPnpmSync} from './support/execPnpm'
import {
prepare,
addDistTag,
execPnpm,
execPnpmSync,
} from './utils'
test('return error status code when underlying command fails', t => {
const result = execPnpmSync('invalid-command')

View File

@@ -10,15 +10,18 @@ import crossSpawn = require('cross-spawn')
const spawnSync = crossSpawn.sync
import isCI = require('is-ci')
import rimraf = require('rimraf-then')
import {add as addDistTag} from './support/distTags'
import prepare from './support/prepare'
import {
prepare,
addDistTag,
testDefaults,
pathToLocalPkg,
local,
execPnpmSync,
} from './utils'
import loadJsonFile = require('load-json-file')
const basicPackageJson = loadJsonFile.sync(path.join(__dirname, './support/simple-package.json'))
const basicPackageJson = loadJsonFile.sync(path.join(__dirname, './utils/simple-package.json'))
import {install, installPkgs, uninstall} from '../src'
import testDefaults from './support/testDefaults'
import exists = require('exists-file')
import {pathToLocalPkg, local} from './support/localPkg'
import {sync as execPnpmSync} from './support/execPnpm'
import isWindows = require('is-windows')
const IS_WINDOWS = isWindows()

View File

@@ -2,8 +2,12 @@ import tape = require('tape')
import promisifyTape from 'tape-promise'
const test = promisifyTape(tape)
import path = require('path')
import isExecutable from './support/isExecutable'
import prepare from './support/prepare'
import {
prepare,
isExecutable,
pathToLocalPkg,
testDefaults,
} from './utils'
import mkdirp = require('mkdirp')
import thenify = require('thenify')
import ncpCB = require('ncp')
@@ -14,8 +18,6 @@ import {
linkFromGlobal,
installPkgs
} from '../src'
import {pathToLocalPkg} from './support/localPkg'
import testDefaults from './support/testDefaults'
test('relative link', async function (t) {
prepare(t)

View File

@@ -3,10 +3,9 @@ import promisifyTape from 'tape-promise'
const test = promisifyTape(tape)
import path = require('path')
import {installPkgs, prune, prunePkgs} from '../src'
import prepare from './support/prepare'
import {prepare, testDefaults} from './utils'
import exists = require('exists-file')
import existsSymlink = require('exists-link')
import testDefaults from './support/testDefaults'
test('prune removes extraneous packages', async function (t) {
const project = prepare(t)

View File

@@ -5,8 +5,7 @@ import path = require('path')
import fs = require('fs')
import exists = require('exists-file')
import existsSymlink = require('exists-link')
import prepare from './support/prepare'
import testDefaults from './support/testDefaults'
import {prepare, testDefaults} from './utils'
import {installPkgs, uninstall} from '../src'
test('uninstall package with no dependencies', async function (t) {

16
test/utils/index.ts Normal file
View File

@@ -0,0 +1,16 @@
import prepare from './prepare'
import testDefaults from './testDefaults'
import execPnpm, {sync as execPnpmSync} from './execPnpm'
import isExecutable from './isExecutable'
import {add as addDistTag} from './distTags'
export {
prepare,
testDefaults,
execPnpm,
execPnpmSync,
isExecutable,
addDistTag,
}
export * from './localPkg'

View File

@@ -1,10 +1,8 @@
import tape = require('tape')
import promisifyTape from 'tape-promise'
import rimraf = require('rimraf-then')
import prepare from './support/prepare'
import testDefaults from './support/testDefaults'
import {prepare, testDefaults, execPnpm} from './utils'
import {verify, installPkgs} from '../src'
import execPnpm from './support/execPnpm'
const test = promisifyTape(tape)