Skip to content

Commit 3ea9f8a

Browse files
ValentinCrochemorealanpoulain
authored andcommitted
Update Quasar tests
1 parent fa52946 commit 3ea9f8a

File tree

2 files changed

+64
-57
lines changed

2 files changed

+64
-57
lines changed

src/generators/QuasarGenerator.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default class extends BaseGenerator {
1313
"utils/mercure.ts",
1414
]);
1515

16-
this.registerTemplates(`quasar/`, [
16+
this.registerTemplates("quasar/", [
1717
// common components
1818
"components/common/ActionCellComponent.vue",
1919
"components/common/BreadcrumbComponent.vue",
@@ -191,17 +191,17 @@ export default {
191191
const paramIndex = fields.findIndex((field) => field.name === p.variable);
192192
if (paramIndex === -1) {
193193
if (p.variable.startsWith("order[")) {
194-
var v = p.variable.slice(6, -1);
195-
var found = fields.findIndex((field) => field.name === v);
194+
let v = p.variable.slice(6, -1);
195+
let found = fields.findIndex((field) => field.name === v);
196196
if (found !== -1) {
197197
fields[found].sortable = true;
198198
}
199199
return;
200200
}
201201

202202
if (p.variable.startsWith("exists[")) {
203-
var exists = p.variable.slice(7, -1);
204-
var foundExistsFieldIndex = fields.findIndex(
203+
let exists = p.variable.slice(7, -1);
204+
let foundExistsFieldIndex = fields.findIndex(
205205
(field) => field.name === exists
206206
);
207207
if (foundExistsFieldIndex !== -1) {
@@ -244,7 +244,10 @@ export default {
244244
[
245245
`${dir}/components/common`,
246246
`${dir}/composables`,
247+
`${dir}/i18n`,
248+
`${dir}/i18n/en-US`,
247249
`${dir}/config`,
250+
`${dir}/router`,
248251
`${dir}/types`,
249252
`${dir}/utils`,
250253
].forEach((dir) => this.createDir(dir, false));

src/generators/QuasarGenerator.test.js

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import QuasarGenerator from "./QuasarGenerator.js";
77

88
const dirname = path.dirname(fileURLToPath(import.meta.url));
99

10-
test("Generate a Quasar app", () => {
10+
test("Generate a Quasar app", async () => {
1111
const generator = new QuasarGenerator({
1212
hydraPrefix: "hydra:",
1313
templateDirectory: `${dirname}/../../templates`,
@@ -21,6 +21,7 @@ test("Generate a Quasar app", () => {
2121
reference: null,
2222
required: true,
2323
description: "An URL",
24+
type: "string",
2425
}),
2526
];
2627
const resource = new Resource("abc", "http://example.com/foos", {
@@ -37,60 +38,63 @@ test("Generate a Quasar app", () => {
3738
title: "My API",
3839
resources: [resource],
3940
});
40-
generator
41-
.generate(api, resource, tmpobj.name)
42-
.then(() => {
43-
expect(fs.existsSync(tmpobj.name + "/components/foo/Create.vue")).toBe(
44-
true
45-
);
46-
expect(fs.existsSync(tmpobj.name + "/components/foo/Form.vue")).toBe(
47-
true
48-
);
49-
expect(fs.existsSync(tmpobj.name + "/components/foo/List.vue")).toBe(
50-
true
51-
);
52-
expect(fs.existsSync(tmpobj.name + "/components/foo/Show.vue")).toBe(
53-
true
54-
);
55-
expect(fs.existsSync(tmpobj.name + "/components/foo/Update.vue")).toBe(
56-
true
57-
);
5841

59-
expect(fs.existsSync(tmpobj.name + "/config/entrypoint.js")).toBe(true);
42+
await generator.generate(api, resource, tmpobj.name, []);
6043

61-
expect(fs.existsSync(tmpobj.name + "/error/SubmissionError.js")).toBe(
62-
true
63-
);
44+
// common components
45+
[
46+
"ActionCell",
47+
"Breadcrumb",
48+
"ConfirmDelete",
49+
"DataFilter",
50+
"FormRepeater",
51+
"Loading",
52+
"Toolbar",
53+
].forEach((name) => {
54+
expect(
55+
fs.existsSync(`${tmpobj.name}/components/common/${name}Component.vue`)
56+
).toBe(true);
57+
});
58+
59+
// components
60+
["Create", "Form", "List", "Show", "Update"].forEach((name) => {
61+
expect(
62+
fs.existsSync(`${tmpobj.name}/components/foo/${name}Component.vue`)
63+
).toBe(true);
64+
});
65+
66+
// i18n
67+
expect(fs.existsSync(`${tmpobj.name}/i18n/en-US/common.ts`)).toBe(true);
68+
expect(fs.existsSync(`${tmpobj.name}/i18n/en-US/foo.ts`)).toBe(true);
69+
70+
// pages
71+
["Create", "List", "Show", "Update"].forEach((name) => {
72+
expect(fs.existsSync(`${tmpobj.name}/pages/foo/${name}Page.vue`)).toBe(
73+
true
74+
);
75+
});
76+
77+
// router
78+
expect(fs.existsSync(`${tmpobj.name}/router/foo.ts`)).toBe(true);
79+
80+
// stores
81+
["create", "delete", "list", "show", "update"].forEach((name) => {
82+
expect(fs.existsSync(`${tmpobj.name}/stores/foo/${name}.ts`)).toBe(true);
83+
});
84+
85+
// types
86+
["breadcrumb", "collection", "error", "foo", "item", "list", "view"].forEach(
87+
(name) => {
88+
expect(fs.existsSync(`${tmpobj.name}/types/${name}.ts`)).toBe(true);
89+
}
90+
);
6491

65-
expect(fs.existsSync(tmpobj.name + "/router/foo.js")).toBe(true);
92+
// utils
93+
expect(fs.existsSync(`${tmpobj.name}/utils/date.ts`)).toBe(true);
94+
expect(fs.existsSync(`${tmpobj.name}/utils/fetch.ts`)).toBe(true);
6695

67-
expect(fs.existsSync(tmpobj.name + "/store/modules/foo/index.js")).toBe(
68-
true
69-
);
96+
// config
97+
expect(fs.existsSync(`${tmpobj.name}/config/entrypoint.ts`)).toBe(true);
7098

71-
["create", "delete", "list", "show", "update"].forEach((action) => {
72-
expect(
73-
fs.existsSync(`${tmpobj.name}/store/modules/foo/${action}/actions.js`)
74-
).toBe(true);
75-
expect(
76-
fs.existsSync(`${tmpobj.name}/store/modules/foo/${action}/getters.js`)
77-
).toBe(true);
78-
expect(
79-
fs.existsSync(`${tmpobj.name}/store/modules/foo/${action}/index.js`)
80-
).toBe(true);
81-
expect(
82-
fs.existsSync(
83-
`${tmpobj.name}/store/modules/foo/${action}/mutation_types.js`
84-
)
85-
).toBe(true);
86-
expect(
87-
fs.existsSync(
88-
`${tmpobj.name}/store/modules/foo/${action}/mutations.js`
89-
)
90-
).toBe(true);
91-
});
92-
expect(fs.existsSync(tmpobj.name + "/utils/fetch.js")).toBe(true);
93-
tmpobj.removeCallback();
94-
})
95-
.catch(() => {});
99+
tmpobj.removeCallback();
96100
});

0 commit comments

Comments
 (0)