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

Jump to bottom

enable typescript services and sdl #515

Merged
merged 25 commits into from
Jun 3, 2020
+3,220 −2,018
Merged

enable typescript services and sdl #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e0cf24a
Add a way to extract the user from the headers.
peterp May 2, 2020
15041af
Add auth package.
peterp May 3, 2020
c313d61
Make auth package compile with TypeScript.
peterp May 3, 2020
edc33bf
Add IP address to the Lambda event's requestContext
bjackson May 16, 2020
eb56ea6
enable typescript services and sdl
May 5, 2020
173dc6c
update tests for sdl
May 14, 2020
c6e8230
add tests for service generation
May 16, 2020
25bdd19
remote dupe test fixtures
May 16, 2020
b0172fd
add graphql types for generated relations in services
May 17, 2020
284c0f4
use only ts template for services
May 18, 2020
3270cb7
extract transform from service, get it working with SDL
May 18, 2020
09568a1
add javascript flag to sdl and service
May 19, 2020
389dd21
ensure tests use default builder args
May 19, 2020
e3d0690
update scaffold code
May 19, 2020
377a62b
fix test regression
May 19, 2020
4db82a4
fix scaffold to use functional options
May 26, 2020
bbf8a01
remove accidentl `only` in test
May 27, 2020
3351d66
fix scaffold optional args
May 27, 2020
ace3453
real world testing updates
May 29, 2020
74b05d9
tests to green
May 30, 2020
387625d
destruction enabled!
May 30, 2020
cf7aede
fixing merge issues
May 30, 2020
dbb0443
fix regressions from template changes
May 30, 2020
12b457a
fixing bad rebase
May 30, 2020
ab53b6b
more merge fixes
May 30, 2020
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
278 changes: 191 additions & 87 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
@@ -1,5 +1,21 @@
global.__dirname = __dirname

import fs from 'fs'

import 'src/lib/test'
import { getPaths, getDefaultArgs } from 'src/lib'

import { defaults, files } from '../../../generate/scaffold/scaffold'
import { tasks } from '../scaffold'

jest.mock('fs')
jest.mock('@babel/core', () => {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

babel is unhappy when you mock fs

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're thinking of creating a wrapper around fs with a few common operations like write, read, unlink in @redwoodjs/internal that should be slightly more manageable to mock.

return {
transform: () => ({
code: '',
}),
}
})
jest.mock('src/lib', () => {
const path = require('path')
return {
Expand All @@ -10,115 +26,203 @@ jest.mock('src/lib', () => {
}
})

import fs from 'fs'
describe('rw destroy scaffold', () => {
describe('destroy scaffold post', () => {
beforeEach(async () => {
fs.__setMockFiles({
...(await files({ ...getDefaultArgs(defaults), model: 'Post' })),
[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="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
].join('\n'),
})
})

import 'src/lib/test'
import { getPaths } from 'src/lib'
afterEach(() => {
fs.__setMockFiles({})
jest.spyOn(fs, 'unlinkSync').mockClear()
})

import { files } from '../../../generate/scaffold/scaffold'
import { tasks } from '../scaffold'
test('destroys files', async () => {
const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
const t = tasks({ model: 'Post' })
t.setRenderer('silent')

describe('destroy scaffold post', () => {
beforeEach(async () => {
fs.__setMockFiles({
...(await files({ model: 'Post' })),
[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="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
].join('\n'),
return t._tasks[0].run().then(async () => {
const generatedFiles = Object.keys(
await files({ ...getDefaultArgs(defaults), model: 'Post' })
)
expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
})
})
})

afterEach(() => {
fs.__setMockFiles({})
jest.spyOn(fs, 'unlinkSync').mockClear()
})
describe('for typescript files', () => {
beforeEach(async () => {
fs.__setMockFiles({}) // clear filesystem so files call works as expected
fs.__setMockFiles({
...(await files({
...getDefaultArgs(defaults),
typescript: true,
model: 'Post',
})),
[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="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
].join('\n'),
})
})

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

return t._tasks[0].run().then(async () => {
const generatedFiles = Object.keys(await files({ model: 'Post' }))
expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
return t._tasks[0].run().then(async () => {
const generatedFiles = Object.keys(
await files({
...getDefaultArgs(defaults),
typescript: true,
model: 'Post',
})
)
expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
generatedFiles.forEach((f) =>
expect(unlinkSpy).toHaveBeenCalledWith(f)
)
})
})
})
})

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

return t._tasks[1].run().then(() => {
const routes = fs.readFileSync(getPaths().web.routes)
expect(routes).toEqual(
[
return t._tasks[1].run().then(() => {
const routes = fs.readFileSync(getPaths().web.routes)
expect(routes).toEqual(
[
'<Routes>',
' <Route path="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
].join('\n')
)
})
})
})

describe('destroy namespaced scaffold post', () => {
beforeEach(async () => {
fs.__setMockFiles({
...(await files({
...getDefaultArgs(defaults),
model: 'Post',
path: 'admin',
})),
[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="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
].join('\n')
)
].join('\n'),
})
})
})
})

describe('destroy namespaced scaffold post', () => {
beforeEach(async () => {
fs.__setMockFiles({
...(await files({ model: 'Post', path: 'admin' })),
[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="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
].join('\n'),
afterEach(() => {
fs.__setMockFiles({})
jest.spyOn(fs, 'unlinkSync').mockClear()
})
})

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

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

return t._tasks[0].run().then(async () => {
const generatedFiles = Object.keys(
await files({ model: 'Post', path: 'admin' })
)
expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
return t._tasks[0].run().then(async () => {
const generatedFiles = Object.keys(
await files({
...getDefaultArgs(defaults),
model: 'Post',
path: 'admin',
})
)
expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
})
})
})

test('cleans up routes from Routes.js', async () => {
const t = tasks({ model: 'Post', path: 'admin' })
t.setRenderer('silent')
describe('for typescript files', () => {
beforeEach(async () => {
fs.__setMockFiles({}) // clear filesystem so files call works as expected
fs.__setMockFiles({
...(await files({
...getDefaultArgs(defaults),
model: 'Post',
path: 'admin',
})),
[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="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
].join('\n'),
})
})
test('destroys files', async () => {
const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
const t = tasks({ model: 'Post', path: 'admin' })
t.setRenderer('silent')

return t._tasks[1].run().then(() => {
const routes = fs.readFileSync(getPaths().web.routes)
expect(routes).toEqual(
[
'<Routes>',
' <Route path="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
].join('\n')
)
return t._tasks[0].run().then(async () => {
const generatedFiles = Object.keys(
await files({
...getDefaultArgs(defaults),
model: 'Post',
path: 'admin',
})
)
expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
generatedFiles.forEach((f) =>
expect(unlinkSpy).toHaveBeenCalledWith(f)
)
})
})
})

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

return t._tasks[1].run().then(() => {
const routes = fs.readFileSync(getPaths().web.routes)
expect(routes).toEqual(
[
'<Routes>',
' <Route path="/" page={HomePage} name="home" />',
' <Route notfound page={NotFoundPage} />',
'</Routes>',
].join('\n')
)
})
})
})
})
Loading