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

[4.4] Move the Cypress Tests to ESM #43676

Merged
merged 12 commits into from
Jun 24, 2024
Merged

[4.4] Move the Cypress Tests to ESM #43676

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8d129e3
[4.4] Move the Cypress Tests to ESM
LadySolveig Jun 20, 2024
b617ae3
drone signature
LadySolveig Jun 20, 2024
7f83e5b
resolve conflicts with #43663
LadySolveig Jun 20, 2024
aa1be18
resolve conflicts with #43663 - part 2
LadySolveig Jun 20, 2024
c3210c5
Fix path.join
LadySolveig Jun 20, 2024
e1c2373
Fix path.join - 2
LadySolveig Jun 20, 2024
fbdc490
Merge branch '4.4-dev' into 4.4/cypress-esm
LadySolveig Jun 20, 2024
3ea76a2
Fix import join from path
LadySolveig Jun 20, 2024
1726dae
Merge branch '4.4-dev' into 4.4/cypress-esm
LadySolveig Jun 20, 2024
7d8d53d
Merge branch '4.4-dev' into 4.4/cypress-esm
laoneo Jun 24, 2024
29cf281
Remove the forgotten commented out orginial imports from plugin/index.js
LadySolveig Jun 24, 2024
beee2ce
Merge branch '4.4-dev' into 4.4/cypress-esm
laoneo Jun 24, 2024
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
Prev Previous commit
Next Next commit
Fix path.join
  • Loading branch information
@LadySolveig
LadySolveig committed Jun 20, 2024
commit c3210c552d0aca943bd9606e399de6b3587661e4
4 changes: 2 additions & 2 deletions tests/System/plugins/fs.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { umask } from 'node:process';
*/
function deleteRelativePath(relativePath, config) {
const fullPath = dirname.join(config.env.cmsPath, relativePath);
fs.rmSync(fullPath, { recursive: true, force: true });
rmSync(fullPath, { recursive: true, force: true });

return null;
}
Expand All @@ -34,7 +34,7 @@ function deleteRelativePath(relativePath, config) {
* @returns null
*/
function writeRelativeFile(relativePath, content, config, mode = 0o444) {
const fullPath = dirname.join(config.env.cmsPath, relativePath);
const fullPath = path.join(config.env.cmsPath, relativePath);
// Prologue: Reset process file mode creation mask to ensure the umask value is not subtracted
const oldmask = umask(0);
// Create missing parent directories with 'rwxrwxrwx'
Expand Down