Skip to content

remove sandbox follow-up command #6811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

remove sandbox follow-up command #6811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions integration-tests/helpers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,7 @@ function execHelper (command, options) {
async function createSandbox (
dependencies = [],
isGitRepo = false,
integrationTestsPaths = ['./integration-tests/*'],
followUpCommand
integrationTestsPaths = ['./integration-tests/*']
) {
const cappedDependencies = dependencies.map(dep => {
if (builtinModules.includes(dep)) return dep
Expand Down Expand Up @@ -321,27 +320,9 @@ async function createSandbox (
execHelper(`sync ${folder}`)
}

if (followUpCommand) {
execHelper(followUpCommand, { cwd: folder, env: restOfEnv })
}

// TODO: Remove this and call `initGitRepo` in individual tests.
if (isGitRepo) {
execHelper('git init', { cwd: folder })
await fs.writeFile(path.join(folder, '.gitignore'), 'node_modules/', { flush: true })
execHelper('git config user.email "[email protected]"', { cwd: folder })
execHelper('git config user.name "John Doe"', { cwd: folder })
execHelper('git config commit.gpgsign false', { cwd: folder })

// Create a unique local bare repo for this test
const localRemotePath = path.join(folder, '..', `${path.basename(folder)}-remote.git`)
if (!existsSync(localRemotePath)) {
execHelper(`git init --bare ${localRemotePath}`)
}

execHelper('git add -A', { cwd: folder })
execHelper('git commit -m "first commit" --no-verify', { cwd: folder })
execHelper(`git remote add origin ${localRemotePath}`, { cwd: folder })
execHelper('git push --set-upstream origin HEAD', { cwd: folder })
initGitRepo()
}

return {
Expand All @@ -358,6 +339,27 @@ async function createSandbox (
}
}

async function initGitRepo () {
const folder = sandbox.folder

execHelper('git init', { cwd: folder })
await fs.writeFile(path.join(folder, '.gitignore'), 'node_modules/', { flush: true })
execHelper('git config user.email "[email protected]"', { cwd: folder })
execHelper('git config user.name "John Doe"', { cwd: folder })
execHelper('git config commit.gpgsign false', { cwd: folder })

// Create a unique local bare repo for this test
const localRemotePath = path.join(folder, '..', `${path.basename(folder)}-remote.git`)
if (!existsSync(localRemotePath)) {
execHelper(`git init --bare ${localRemotePath}`)
}

execHelper('git add -A', { cwd: folder })
execHelper('git commit -m "first commit" --no-verify', { cwd: folder })
execHelper(`git remote add origin ${localRemotePath}`, { cwd: folder })
execHelper('git push --set-upstream origin HEAD', { cwd: folder })
}

/**
* @typedef {{ default: string, star: string, destructure: string }} Variants
*/
Expand Down
Loading