Skip to content

Commit 0bf672c

Browse files
committed
fix pages and tests issue
1 parent 54b25d5 commit 0bf672c

File tree

2 files changed

+41
-30
lines changed

2 files changed

+41
-30
lines changed

lib/component/pages.js

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,22 @@ async function writePages(element, path, jsonSchemaRelativePath, helperPath, mod
8585
await waitFor(50);
8686

8787
// write method
88-
let method = element.request.method
88+
let method
89+
if (element.request.hasOwnProperty('method')) {
90+
method = element.request.method
91+
}
8992
let code = contents.replace("{{method}}", (method).toLowerCase())
90-
await waitFor(50);
93+
await waitFor(50);
9194

9295
// write headers
9396
let headers = '';
94-
asyncForEach(element.request.header, async (header) => {
95-
if (header.disabled != true) {
96-
headers += '\r\n'+'\t\t'+'.set("' + header.key + '", "' + header.value + '")';
97-
}
98-
})
97+
if (element.request.hasOwnProperty('header')) {
98+
asyncForEach(element.request.header, async (header) => {
99+
if (header.disabled != true) {
100+
headers += '\r\n'+'\t\t'+'.set("' + header.key + '", "' + header.value + '")';
101+
}
102+
})
103+
}
99104
await waitFor(50);
100105
// if any auth
101106
if (element.request.hasOwnProperty('auth')){
@@ -105,36 +110,39 @@ async function writePages(element, path, jsonSchemaRelativePath, helperPath, mod
105110
}
106111
}
107112
await waitFor(50);
108-
109113
code = code.replace("{{header}}", headers)
110114

111115
// write endpoint
112116
let dataQuery = ''
113-
if (element.request.url.hasOwnProperty('query')) {
114-
let firstData = true
115-
dataQuery += '\r\n'+'\t\t'+ '.query({ '
116-
asyncForEach(element.request.url.query, async (query) => {
117-
if (query.disabled != true) {
118-
if (firstData === false) dataQuery += ', ';
119-
dataQuery += query.key + ': "' + query.value + '"';
120-
firstData = false;
121-
}
122-
})
123-
await waitFor(50);
124-
dataQuery += ' })'
125-
} else {
126-
dataQuery = ''
117+
if (element.request.hasOwnProperty('url')) {
118+
if (element.request.url.hasOwnProperty('query')) {
119+
let firstData = true
120+
dataQuery += '\r\n'+'\t\t'+ '.query({ '
121+
asyncForEach(element.request.url.query, async (query) => {
122+
if (query.disabled != true) {
123+
if (firstData === false) dataQuery += ', ';
124+
dataQuery += query.key + ': "' + query.value + '"';
125+
firstData = false;
126+
}
127+
})
128+
await waitFor(50);
129+
dataQuery += ' })'
130+
} else {
131+
dataQuery = ''
132+
}
127133
}
128134
await waitFor(50);
129135
code = code.replace("{{query}}", dataQuery)
130136

131-
let url = element.request.url.raw
132-
if (url.includes('http')) {
133-
code = code.replace("{{endpoint}}", new URL(url).pathname)
134-
} else {
135-
const fakeBase = 'https://fake.dot'
136-
let base = url.split('/')
137-
code = code.replace("{{endpoint}}", new URL((url).replace(base[0], fakeBase)).pathname)
137+
if (element.request.hasOwnProperty('url')) {
138+
let url = element.request.url.raw
139+
if (url.includes('http')) {
140+
code = code.replace("{{endpoint}}", new URL(url).pathname)
141+
} else {
142+
const fakeBase = 'https://fake.dot'
143+
let base = url.split('/')
144+
code = code.replace("{{endpoint}}", new URL((url).replace(base[0], fakeBase)).pathname)
145+
}
138146
}
139147

140148
code = code.replace("{{objectBody}}", bodyRaw)

lib/component/tests.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ async function writeTest(element, path, pagesPath, moduleType, configPath) {
1212

1313
let name = (element.name).toLowerCase().replace(/\s/g, '');
1414
name = name.replace(/\//g, '');
15-
let method = element.request.method
15+
let method
16+
if (element.request.hasOwnProperty('method')) {
17+
method = element.request.method
18+
}
1619

1720
// write describe
1821
let code = contents.replace("{{describe}}", 'Test ' + element.name)

0 commit comments

Comments
 (0)