Skip to content

Commit 65309bd

Browse files
brandenrodgersbrandenrodgers
committed
fix: use path.sep to make this os agnostic
1 parent 8320c6f commit 65309bd

File tree

3 files changed

+64
-22
lines changed

3 files changed

+64
-22
lines changed

‎api/__tests__/projects.test.ts‎

Lines changed: 57 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ describe('api/projects', () => {
102102
);
103103
expect(http.post).toHaveBeenCalledTimes(1);
104104
expect(http.post).toHaveBeenCalledWith(accountId, {
105-
url: `dfs/v1/projects/upload/${encodeURIComponent(projectNameIllegalChars)}`,
105+
url: `dfs/v1/projects/upload/${encodeURIComponent(
106+
projectNameIllegalChars
107+
)}`,
106108
timeout: 60_000,
107109
data: {
108110
file: formData,
@@ -148,7 +150,9 @@ describe('api/projects', () => {
148150
await fetchProject(accountId, projectNameIllegalChars);
149151
expect(http.get).toHaveBeenCalledTimes(1);
150152
expect(http.get).toHaveBeenCalledWith(accountId, {
151-
url: `developer/projects/v1/by-name/${encodeURIComponent(projectNameIllegalChars)}`,
153+
url: `developer/projects/v1/by-name/${encodeURIComponent(
154+
projectNameIllegalChars
155+
)}`,
152156
});
153157
});
154158
});
@@ -183,7 +187,9 @@ describe('api/projects', () => {
183187
await downloadProject(accountId, projectNameIllegalChars, buildId);
184188
expect(http.get).toHaveBeenCalledTimes(1);
185189
expect(http.get).toHaveBeenCalledWith(accountId, {
186-
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/${buildId}/archive-full`,
190+
url: `dfs/v1/projects/${encodeURIComponent(
191+
projectNameIllegalChars
192+
)}/builds/${buildId}/archive-full`,
187193
responseType: 'arraybuffer',
188194
headers: {
189195
accept: 'application/zip',
@@ -206,7 +212,9 @@ describe('api/projects', () => {
206212
await deleteProject(accountId, projectNameIllegalChars);
207213
expect(http.delete).toHaveBeenCalledTimes(1);
208214
expect(http.delete).toHaveBeenCalledWith(accountId, {
209-
url: `developer/projects/v1/${encodeURIComponent(projectNameIllegalChars)}`,
215+
url: `developer/projects/v1/${encodeURIComponent(
216+
projectNameIllegalChars
217+
)}`,
210218
});
211219
});
212220
});
@@ -238,7 +246,9 @@ describe('api/projects', () => {
238246
await fetchProjectBuilds(accountId, projectNameIllegalChars);
239247
expect(http.get).toHaveBeenCalledTimes(1);
240248
expect(http.get).toHaveBeenCalledWith(accountId, {
241-
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds`,
249+
url: `dfs/v1/projects/${encodeURIComponent(
250+
projectNameIllegalChars
251+
)}/builds`,
242252
params: {},
243253
});
244254
});
@@ -258,7 +268,9 @@ describe('api/projects', () => {
258268
await getBuildStatus(accountId, projectNameIllegalChars, buildId);
259269
expect(http.get).toHaveBeenCalledTimes(1);
260270
expect(http.get).toHaveBeenCalledWith(accountId, {
261-
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/${buildId}/status`,
271+
url: `dfs/v1/projects/${encodeURIComponent(
272+
projectNameIllegalChars
273+
)}/builds/${buildId}/status`,
262274
});
263275
});
264276
});
@@ -277,7 +289,9 @@ describe('api/projects', () => {
277289
await getBuildStructure(accountId, projectNameIllegalChars, buildId);
278290
expect(http.get).toHaveBeenCalledTimes(1);
279291
expect(http.get).toHaveBeenCalledWith(accountId, {
280-
url: `dfs/v1/builds/by-project-name/${encodeURIComponent(projectNameIllegalChars)}/builds/${buildId}/structure`,
292+
url: `dfs/v1/builds/by-project-name/${encodeURIComponent(
293+
projectNameIllegalChars
294+
)}/builds/${buildId}/structure`,
281295
});
282296
});
283297
});
@@ -311,7 +325,9 @@ describe('api/projects', () => {
311325
await getDeployStatus(accountId, projectNameIllegalChars, deployId);
312326
expect(http.get).toHaveBeenCalledTimes(1);
313327
expect(http.get).toHaveBeenCalledWith(accountId, {
314-
url: `dfs/deploy/v1/deploy-status/projects/${encodeURIComponent(projectNameIllegalChars)}/deploys/${deployId}`,
328+
url: `dfs/deploy/v1/deploy-status/projects/${encodeURIComponent(
329+
projectNameIllegalChars
330+
)}/deploys/${deployId}`,
315331
});
316332
});
317333
});
@@ -330,7 +346,9 @@ describe('api/projects', () => {
330346
await getDeployStructure(accountId, projectNameIllegalChars, deployId);
331347
expect(http.get).toHaveBeenCalledTimes(1);
332348
expect(http.get).toHaveBeenCalledWith(accountId, {
333-
url: `dfs/deploy/v1/deploys/by-project-name/${encodeURIComponent(projectNameIllegalChars)}/deploys/${deployId}/structure`,
349+
url: `dfs/deploy/v1/deploys/by-project-name/${encodeURIComponent(
350+
projectNameIllegalChars
351+
)}/deploys/${deployId}/structure`,
334352
});
335353
});
336354
});
@@ -348,7 +366,9 @@ describe('api/projects', () => {
348366
await fetchProjectSettings(accountId, projectNameIllegalChars);
349367
expect(http.get).toHaveBeenCalledTimes(1);
350368
expect(http.get).toHaveBeenCalledWith(accountId, {
351-
url: `developer/projects/v1/${encodeURIComponent(projectNameIllegalChars)}/settings`,
369+
url: `developer/projects/v1/${encodeURIComponent(
370+
projectNameIllegalChars
371+
)}/settings`,
352372
});
353373
});
354374
});
@@ -370,7 +390,9 @@ describe('api/projects', () => {
370390
await provisionBuild(accountId, projectNameIllegalChars);
371391
expect(http.post).toHaveBeenCalledTimes(1);
372392
expect(http.post).toHaveBeenCalledWith(accountId, {
373-
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/staged/provision`,
393+
url: `dfs/v1/projects/${encodeURIComponent(
394+
projectNameIllegalChars
395+
)}/builds/staged/provision`,
374396
params: {},
375397
headers: { 'Content-Type': 'application/json' },
376398
timeout: 50_000,
@@ -394,7 +416,9 @@ describe('api/projects', () => {
394416
await queueBuild(accountId, projectNameIllegalChars);
395417
expect(http.post).toHaveBeenCalledTimes(1);
396418
expect(http.post).toHaveBeenCalledWith(accountId, {
397-
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/staged/queue`,
419+
url: `dfs/v1/projects/${encodeURIComponent(
420+
projectNameIllegalChars
421+
)}/builds/staged/queue`,
398422
params: {},
399423
headers: { 'Content-Type': 'application/json' },
400424
});
@@ -408,7 +432,9 @@ describe('api/projects', () => {
408432
await uploadFileToBuild(accountId, projectName, filePath, path);
409433
expect(http.put).toHaveBeenCalledTimes(1);
410434
expect(http.put).toHaveBeenCalledWith(accountId, {
411-
url: `dfs/v1/projects/${projectName}/builds/staged/files/${encodeURIComponent(path)}`,
435+
url: `dfs/v1/projects/${projectName}/builds/staged/files/${encodeURIComponent(
436+
path
437+
)}`,
412438
data: { file: formData },
413439
headers: { 'Content-Type': 'multipart/form-data' },
414440
});
@@ -425,7 +451,9 @@ describe('api/projects', () => {
425451
);
426452
expect(http.put).toHaveBeenCalledTimes(1);
427453
expect(http.put).toHaveBeenCalledWith(accountId, {
428-
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/staged/files/${encodeURIComponent(path)}`,
454+
url: `dfs/v1/projects/${encodeURIComponent(
455+
projectNameIllegalChars
456+
)}/builds/staged/files/${encodeURIComponent(path)}`,
429457
data: { file: formData },
430458
headers: { 'Content-Type': 'multipart/form-data' },
431459
});
@@ -438,7 +466,9 @@ describe('api/projects', () => {
438466
await deleteFileFromBuild(accountId, projectName, path);
439467
expect(http.delete).toHaveBeenCalledTimes(1);
440468
expect(http.delete).toHaveBeenCalledWith(accountId, {
441-
url: `dfs/v1/projects/${projectName}/builds/staged/files/${encodeURIComponent(path)}`,
469+
url: `dfs/v1/projects/${projectName}/builds/staged/files/${encodeURIComponent(
470+
path
471+
)}`,
442472
});
443473
});
444474

@@ -447,7 +477,9 @@ describe('api/projects', () => {
447477
await deleteFileFromBuild(accountId, projectNameIllegalChars, filePath);
448478
expect(http.delete).toHaveBeenCalledTimes(1);
449479
expect(http.delete).toHaveBeenCalledWith(accountId, {
450-
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/staged/files/${encodeURIComponent(filePath)}`,
480+
url: `dfs/v1/projects/${encodeURIComponent(
481+
projectNameIllegalChars
482+
)}/builds/staged/files/${encodeURIComponent(filePath)}`,
451483
});
452484
});
453485
});
@@ -466,7 +498,9 @@ describe('api/projects', () => {
466498
await cancelStagedBuild(accountId, projectNameIllegalChars);
467499
expect(http.post).toHaveBeenCalledTimes(1);
468500
expect(http.post).toHaveBeenCalledWith(accountId, {
469-
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/staged/cancel`,
501+
url: `dfs/v1/projects/${encodeURIComponent(
502+
projectNameIllegalChars
503+
)}/builds/staged/cancel`,
470504
headers: { 'Content-Type': 'application/json' },
471505
});
472506
});
@@ -486,7 +520,9 @@ describe('api/projects', () => {
486520
await fetchBuildWarnLogs(accountId, projectNameIllegalChars, buildId);
487521
expect(http.get).toHaveBeenCalledTimes(1);
488522
expect(http.get).toHaveBeenCalledWith(accountId, {
489-
url: `dfs/logging/v1/logs/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/${buildId}/combined/warn`,
523+
url: `dfs/logging/v1/logs/projects/${encodeURIComponent(
524+
projectNameIllegalChars
525+
)}/builds/${buildId}/combined/warn`,
490526
});
491527
});
492528
});
@@ -505,7 +541,9 @@ describe('api/projects', () => {
505541
await fetchDeployWarnLogs(accountId, projectNameIllegalChars, deployId);
506542
expect(http.get).toHaveBeenCalledTimes(1);
507543
expect(http.get).toHaveBeenCalledWith(accountId, {
508-
url: `dfs/logging/v1/logs/projects/${encodeURIComponent(projectNameIllegalChars)}/deploys/${deployId}/combined/warn`,
544+
url: `dfs/logging/v1/logs/projects/${encodeURIComponent(
545+
projectNameIllegalChars
546+
)}/deploys/${deployId}/combined/warn`,
509547
});
510548
});
511549
});

‎api/projects.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ export async function fetchProject(
7676
projectName: string
7777
): Promise<Project> {
7878
return http.get(accountId, {
79-
url: `${DEVELOPER_PROJECTS_API_PATH}/by-name/${encodeURIComponent(projectName)}`,
79+
url: `${DEVELOPER_PROJECTS_API_PATH}/by-name/${encodeURIComponent(
80+
projectName
81+
)}`,
8082
});
8183
}
8284

@@ -198,7 +200,9 @@ export async function fetchProjectSettings(
198200
projectName: string
199201
): Promise<ProjectSettings> {
200202
return http.get(accountId, {
201-
url: `${DEVELOPER_PROJECTS_API_PATH}/${encodeURIComponent(projectName)}/settings`,
203+
url: `${DEVELOPER_PROJECTS_API_PATH}/${encodeURIComponent(
204+
projectName
205+
)}/settings`,
202206
});
203207
}
204208

‎lib/cms/handleFieldsJS.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export function isConvertableFieldJs(
164164
return !!(
165165
convertFields &&
166166
allowedFieldsNames.includes(baseName) &&
167-
(inModuleFolder || relativePath == '/')
167+
(inModuleFolder || relativePath == path.sep)
168168
);
169169
}
170170

0 commit comments

Comments
 (0)