Skip to content
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

Scaffold Generator File Organization #2613

Merged
merged 22 commits into from
Jun 10, 2021
Merged

Scaffold Generator File Organization #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
68d3bd5
revised scaffold file organization
cjreimer May 23, 2021
876f936
fixed scaffold tests
cjreimer May 23, 2021
db946d0
Merge branch 'main' into cjr-generator-scaffold-org
cjreimer May 23, 2021
d263db3
scaffold changes
cjreimer May 23, 2021
db4a69c
fixed layout import
cjreimer May 23, 2021
bcdea30
e2e tutorial updates
cjreimer May 23, 2021
d181fdb
Merge branch 'main' into cjr-generator-scaffold-org
cjreimer May 25, 2021
c51656d
Merge branch 'main' into cjr-generator-scaffold-org
cjreimer May 25, 2021
8c74e1e
flag name change
cjreimer May 30, 2021
c877ab4
PR #2613 changes
cjreimer May 31, 2021
5db9ed1
Merge branch 'cjr-generator-scaffold-org' of https://github.com/cjrei…
cjreimer May 31, 2021
3b1a599
progressed tests
cjreimer May 31, 2021
8abf449
updated tests
cjreimer Jun 2, 2021
c26fbc2
scaffold and tests
cjreimer Jun 2, 2021
70fbdca
continued test setup
cjreimer Jun 6, 2021
f17b3fc
Merge branch 'main' into cjr-generator-scaffold-org
cjreimer Jun 6, 2021
b02c23b
generator udpates
cjreimer Jun 7, 2021
dcd18c3
fixed generator path issues
cjreimer Jun 10, 2021
c89f6c3
Merge branch 'main' into cjr-generator-scaffold-org
cjreimer Jun 10, 2021
7daaa48
updated generated imports
cjreimer Jun 10, 2021
797e0c0
Merge branch 'main' into cjr-generator-scaffold-org
cjreimer Jun 10, 2021
b40af29
Merge branch 'main' into cjr-generator-scaffold-org
jtoar Jun 10, 2021
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
85 changes: 67 additions & 18 deletions packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ describe('rw destroy scaffold', () => {
describe('destroy scaffold post', () => {
beforeEach(async () => {
fs.__setMockFiles({
...(await files({ ...getDefaultArgs(defaults), model: 'Post' })),
...(await files({
...getDefaultArgs(defaults),
model: 'Post',
tests: false,
nestScaffoldByModel: true,
})),
[getPaths().web.routes]: [
'<Routes>',
' <Route path="/posts/new" page={NewPostPage} name="newPost" />',
Expand All @@ -53,12 +58,21 @@ describe('rw destroy scaffold', () => {

test('destroys files', async () => {
const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
const t = tasks({ model: 'Post' })
const t = tasks({
model: 'Post',
tests: false,
nestScaffoldByModel: true,
})
t.setRenderer('silent')

return t._tasks[0].run().then(async () => {
const generatedFiles = Object.keys(
await files({ ...getDefaultArgs(defaults), model: 'Post' })
await files({
...getDefaultArgs(defaults),
model: 'Post',
tests: false,
nestScaffoldByModel: true,
})
)
expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
Expand All @@ -73,13 +87,15 @@ describe('rw destroy scaffold', () => {
...getDefaultArgs(defaults),
typescript: true,
model: 'Post',
tests: false,
nestScaffoldByModel: true,
})),
[getPaths().web.routes]: [
'<Routes>',
' <Route path="/posts/new" page={NewPostPage} name="newPost" />',
' <Route path="/posts/{id:Int}/edit" page={EditPostPage} name="editPost" />',
' <Route path="/posts/{id:Int}" page={PostPage} name="post" />',
' <Route path="/posts" page={PostsPage} name="posts" />',
' <Route path="/posts/new" page={PostNewPostPage} name="newPos" />',
' <Route path="/posts/{id:Int}/edit" page={PostEditPostPage} name="editPost" />',
' <Route path="/posts/{id:Int}" page={PostPostPage} name="post" />',
' <Route path="/posts" page={PostPostsPage} name="posts" />',
' <Route path="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
Expand All @@ -89,7 +105,11 @@ describe('rw destroy scaffold', () => {

test('destroys files', async () => {
const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
const t = tasks({ model: 'Post' })
const t = tasks({
model: 'Post',
tests: false,
nestScaffoldByModel: true,
})
t.setRenderer('silent')

return t._tasks[0].run().then(async () => {
Expand All @@ -98,6 +118,8 @@ describe('rw destroy scaffold', () => {
...getDefaultArgs(defaults),
typescript: true,
model: 'Post',
tests: false,
nestScaffoldByModel: true,
})
)
expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
Expand All @@ -109,7 +131,11 @@ describe('rw destroy scaffold', () => {
})

test('cleans up routes from Routes.js', async () => {
const t = tasks({ model: 'Post' })
const t = tasks({
model: 'Post',
tests: false,
nestScaffoldByModel: true,
})
t.setRenderer('silent')

return t._tasks[1].run().then(() => {
Expand All @@ -133,12 +159,14 @@ describe('rw destroy scaffold', () => {
...getDefaultArgs(defaults),
model: 'Post',
path: 'admin',
tests: false,
nestScaffoldByModel: true,
})),
[getPaths().web.routes]: [
'<Routes>',
' <Route path="/admin/posts/new" page={AdminNewPostPage} name="adminNewPost" />',
' <Route path="/admin/posts/{id:Int}/edit" page={AdminEditPostPage} name="adminEditPost" />',
' <Route path="/admin/posts/{id:Int}" page={AdminPostPage} name="adminPost" />',
' <Route path="/admin/posts/new" page={AdminPostNewPostPage} name="adminNewPost" />',
' <Route path="/admin/posts/{id:Int}/edit" page={AdminPostEditPostPage} name="adminEditPost" />',
' <Route path="/admin/posts/{id:Int}" page={AdminPostPostPage} name="adminPost" />',
' <Route path="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
Expand All @@ -153,7 +181,12 @@ describe('rw destroy scaffold', () => {

test('destroys files', async () => {
const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
const t = tasks({ model: 'Post', path: 'admin' })
const t = tasks({
model: 'Post',
path: 'admin',
tests: false,
nestScaffoldByModel: true,
})
t.setRenderer('silent')

return t._tasks[0].run().then(async () => {
Expand All @@ -162,6 +195,8 @@ describe('rw destroy scaffold', () => {
...getDefaultArgs(defaults),
model: 'Post',
path: 'admin',
tests: false,
nestScaffoldByModel: true,
})
)
expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
Expand All @@ -177,12 +212,14 @@ describe('rw destroy scaffold', () => {
...getDefaultArgs(defaults),
model: 'Post',
path: 'admin',
tests: false,
nestScaffoldByModel: true,
})),
[getPaths().web.routes]: [
'<Routes>',
' <Route path="/admin/posts/new" page={AdminNewPostPage} name="adminNewPost" />',
' <Route path="/admin/posts/{id:Int}/edit" page={AdminEditPostPage} name="adminEditPost" />',
' <Route path="/admin/posts/{id:Int}" page={AdminPostPage} name="adminPost" />',
' <Route path="/admin/posts/new" page={AdminPostNewPostPage} name="adminNewPost" />',
' <Route path="/admin/posts/{id:Int}/edit" page={AdminPostEditPostPage} name="adminEditPost" />',
' <Route path="/admin/posts/{id:Int}" page={AdminPostPostPage} name="adminPost" />',
' <Route path="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
Expand All @@ -191,7 +228,12 @@ describe('rw destroy scaffold', () => {
})
test('destroys files', async () => {
const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
const t = tasks({ model: 'Post', path: 'admin' })
const t = tasks({
model: 'Post',
path: 'admin',
tests: false,
nestScaffoldByModel: true,
})
t.setRenderer('silent')

return t._tasks[0].run().then(async () => {
Expand All @@ -200,6 +242,8 @@ describe('rw destroy scaffold', () => {
...getDefaultArgs(defaults),
model: 'Post',
path: 'admin',
tests: false,
nestScaffoldByModel: true,
})
)
expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
Expand All @@ -211,7 +255,12 @@ describe('rw destroy scaffold', () => {
})

test('cleans up routes from Routes.js', async () => {
const t = tasks({ model: 'Post', path: 'admin' })
const t = tasks({
model: 'Post',
path: 'admin',
tests: false,
nestScaffoldByModel: true,
})
t.setRenderer('silent')

return t._tasks[1].run().then(() => {
Expand Down
Loading