Skip to content

Resolving path inconsistency in container.js and appium.js #4866

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

Merged
merged 3 commits into from
Mar 5, 2025
Merged

Resolving path inconsistency in container.js and appium.js #4866

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f04e576
Update Appium.js
mjalav Feb 25, 2025
39bc009
Update container.js
mjalav Feb 26, 2025
5ad7f5a
Update lib/container.js
mjalav Mar 4, 2025
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
15 changes: 14 additions & 1 deletion lib/container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ function loadGherkinSteps(paths) {
loadSupportObject(path, `Step Definition from ${path}`)
}
} else {
const folderPath = paths.startsWith('.') ? path.join(global.codecept_dir, paths) : ''
const folderPath = paths.startsWith('.') ? normalizeAndJoin(global.codecept_dir, paths) : ''
if (folderPath !== '') {
globSync(folderPath).forEach(file => {
loadSupportObject(file, `Step Definition from ${file}`)
Expand Down Expand Up @@ -562,3 +562,16 @@ function getHelperModuleName(helperName, config) {
// built-in helpers
return `./helper/${helperName}`
}

function normalizeAndJoin(basePath, subPath) {
// Normalize the path (handles extra slashes and resolves `..`)
let normalizedBase = path.normalize(basePath);
let normalizedSub = path.normalize(subPath);

// Replace backslashes with forward slashes
normalizedBase = normalizedBase.replace(/\\/g, '/');
normalizedSub = normalizedSub.replace(/\\/g, '/');

// Join the paths using POSIX-style
return path.posix.join(normalizedBase, normalizedSub);
}
4 changes: 3 additions & 1 deletion lib/helper/Appium.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,10 @@ class Appium extends Webdriver {

_buildAppiumEndpoint() {
const { protocol, port, hostname, path } = this.browser.options
// Ensure path does NOT end with a slash to prevent double slashes
const normalizedPath = path.replace(/\/$/, '');
// Build path to Appium REST API endpoint
return `${protocol}://${hostname}:${port}${path}/session/${this.browser.sessionId}`
return `${protocol}://${hostname}:${port}${normalizedPath}/session/${this.browser.sessionId}`
}

/**
Expand Down
Loading