-
Notifications
You must be signed in to change notification settings - Fork 79
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.
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
refactor: move init command functions into lib and introduce tests #168
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -88,6 +88,9 @@ | |
"ava": { | ||
"require": [ | ||
"@babel/register" | ||
], | ||
"files": [ | ||
"test/**/*.js" | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import path from 'path'; | ||
import fs from 'fs-extra'; | ||
|
||
export async function checkProjectExists(basename) { | ||
const projectPath = path.resolve(process.cwd(), basename) | ||
const exists = await fs.pathExists(projectPath) | ||
|
||
if (exists) { | ||
throw new Error(`Couldn't initialize project. Project with name ${basename} already exists in ${projectPath}. Use different <name> or rename existing project folder.`) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
export * from './check-project-exists'; | ||
export * from './prepare-template'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import path from 'path'; | ||
import fs from 'fs-extra'; | ||
|
||
export async function prepareTemplate(basename, appName) { | ||
const arappPath = path.resolve(basename, 'arapp.json') | ||
const arapp = await fs.readJson(arappPath) | ||
|
||
arapp.appName = appName | ||
|
||
const gitFolderPath = path.resolve(basename, '.git') | ||
|
||
return Promise.all([ | ||
fs.writeJson(arappPath, arapp, { spaces: 2 }), | ||
fs.remove(gitFolderPath) | ||
]) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
import test from 'ava'; | ||
import fs from 'fs-extra'; | ||
|
||
import { checkProjectExists, prepareTemplate } from '../../src/lib/init'; | ||
|
||
const projectPath = './.tmp/aragon-app' | ||
|
||
test.beforeEach(t => { | ||
fs.ensureDirSync(projectPath) | ||
}) | ||
|
||
test.afterEach(t => { | ||
fs.removeSync(projectPath) | ||
}) | ||
|
||
test('check if project folder already exists', async t => { | ||
try { | ||
await checkProjectExists(projectPath) | ||
t.fail() | ||
} catch (err) { | ||
t.pass() | ||
} | ||
}) | ||
|
||
test('prepare project template', async t => { | ||
|
||
const repoPath = `${projectPath}/.git` | ||
const arappPath = `${projectPath}/arapp.json` | ||
const appName = 'TestApp' | ||
|
||
await fs.ensureDir(repoPath) | ||
await fs.ensureFile(arappPath) | ||
await fs.writeJson(arappPath, { | ||
appName: 'boilerplate-placeholder' | ||
}) | ||
|
||
await prepareTemplate(projectPath, appName) | ||
const project = await fs.readJson(arappPath) | ||
|
||
t.falsy(await fs.pathExists(repoPath)) | ||
t.is(appName, project.appName) | ||
}) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Basically went back to having the tasks defined inline, as the actual functionality is moved into lib modules now. That way, we can easily move away from tasklist at some point, without having to worry about touch test imports.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perfect
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm working on #98, is ok to refactor my implementation of the new command aragon start?