-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Issue 1431: fix copy multiple locators + small refactoring #1439
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,3 @@ | ||
export const escapeLocator = (locator: string) => { | ||
let transformedText = locator.replace(/[\\'\n]/g, (match: string) => { | ||
switch (match) { | ||
case "\\": | ||
return "\\\\\\\\"; | ||
case "'": | ||
return "\\'"; | ||
case "\n": | ||
return "\\n"; | ||
default: | ||
return match; | ||
} | ||
}); | ||
const lastDoubleQuote = transformedText.lastIndexOf('"'); | ||
const firstDoubleQuote = transformedText.indexOf('"'); | ||
const beforeFirstDoubleQuote = transformedText.slice(0, firstDoubleQuote + 1); | ||
const afterLastDoubleQuote = transformedText.slice(lastDoubleQuote); | ||
let insideOfDoubleQuotes = transformedText.slice(firstDoubleQuote + 1, lastDoubleQuote); | ||
|
||
if (insideOfDoubleQuotes.includes('"')) { | ||
insideOfDoubleQuotes = insideOfDoubleQuotes.replace(/"/g, '\\\\"'); | ||
transformedText = beforeFirstDoubleQuote + insideOfDoubleQuotes + afterLastDoubleQuote; | ||
} | ||
|
||
return transformedText; | ||
}; | ||
|
||
export const copyToClipboard = (value: string | string[]) => { | ||
let transformedText; | ||
|
||
if (typeof value === "string") { | ||
transformedText = escapeLocator(value); | ||
} else { | ||
transformedText = value.map((el: string) => escapeLocator(el)).join("\\n\\n"); | ||
} | ||
|
||
chrome.devtools.inspectedWindow.eval(`copy('${transformedText}')`); | ||
chrome.devtools.inspectedWindow.eval(`copy('${value}')`); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
import { copyToClipboard } from "../../../common/utils/copyToClipboard"; | ||
|
||
export const escapeLocator = (locator: string) => { | ||
let transformedText = locator.replace(/[\\'\n]/g, (match: string) => { | ||
switch (match) { | ||
case "\\": | ||
return "\\\\\\\\"; | ||
case "'": | ||
return "\\'"; | ||
case "\n": | ||
return "\\n"; | ||
default: | ||
return match; | ||
} | ||
}); | ||
const lastDoubleQuote = transformedText.lastIndexOf('"'); | ||
const firstDoubleQuote = transformedText.indexOf('"'); | ||
const beforeFirstDoubleQuote = transformedText.slice(0, firstDoubleQuote + 1); | ||
const afterLastDoubleQuote = transformedText.slice(lastDoubleQuote); | ||
let insideOfDoubleQuotes = transformedText.slice(firstDoubleQuote + 1, lastDoubleQuote); | ||
|
||
if (insideOfDoubleQuotes.includes('"')) { | ||
insideOfDoubleQuotes = insideOfDoubleQuotes.replace(/"/g, '\\\\"'); | ||
transformedText = beforeFirstDoubleQuote + insideOfDoubleQuotes + afterLastDoubleQuote; | ||
} | ||
|
||
return transformedText; | ||
}; | ||
|
||
export const copyLocatorToClipboard = (value: string) => { | ||
const transformedText = escapeLocator(value); | ||
copyToClipboard(transformedText); | ||
}; | ||
|
||
export const copyLocatorsToClipboard = (valueArr: string[]) => { | ||
const transformedText = valueArr.map((el: string) => escapeLocator(el)).join("\\n\\n"); | ||
copyToClipboard(transformedText); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like magic strings to me now.
Is it possible for you to add an explanation or constants with meaningful names to the code explaining them?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry, not my code. but it's covered with tests, hope they could help you to understand what's going on
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just refactored location of this function
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what tests cover this code?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"escape symbols in locator"
from https://github.com/jdi-testing/jdn-ai/pull/1439/files#diff-c3f66e9470dbf46aa684c5ffec7394f39ed3ff49ba5e11d6aa1427f317a57938