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

Upgrades code-mirror, browsermob-proxy and mouse-trap #6940

Merged
merged 33 commits into from
Jun 29, 2019
Merged

Upgrades code-mirror, browsermob-proxy and mouse-trap #6940

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f1e6dd2
Initial upgrade
Jun 16, 2019
8b8a6a9
test
Jun 16, 2019
cfc573b
update ui-code mirror
Jun 17, 2019
b45b66a
Update diff_match
Jun 17, 2019
a02543a
Change the version of code-mirror
Jun 17, 2019
b61f1db
Merge
Jun 18, 2019
be3b3bc
Fresh package-lock.json
Jun 19, 2019
580da3d
Merge remote-tracking branch 'origin/develop' into ui-utills
Jun 20, 2019
583e2b7
Merge conflicts
Jun 20, 2019
502842b
Merge conflicts-2
Jun 20, 2019
c0c76ad
Merge remote-tracking branch 'origin/develop' into ui-utills
Jun 20, 2019
b46d715
Add diff_match_patch
Jun 20, 2019
47b51fd
update the link diff-match-patch
Jun 20, 2019
fdabaac
Fix mistakes with cdn link
Jun 21, 2019
d2acf5a
Merge develop
Jun 22, 2019
f5df88b
Merge remote-tracking branch 'origin/develop' into ui-utills
Jun 23, 2019
7dbdcd6
Change dpm verison
Jun 23, 2019
8f399e7
Merge remote-tracking branch 'origin/develop' into ui-utills
Jun 24, 2019
1a9d9ed
Merge remote-tracking branch 'origin/develop' into ui-utills
Jun 25, 2019
9987c2a
Update e2e Tests
Jun 25, 2019
b1bbb2e
Fix lint
Jun 25, 2019
b921a4c
Fix lines
Jun 26, 2019
997cf6a
Remove eslint
Jun 26, 2019
0e1ee0b
Add Doctring
Jun 26, 2019
f1d6810
Update highlight text function
Jun 26, 2019
09bbcda
Update docstrings
Jun 26, 2019
9749d50
Add scroll to checker
Jun 27, 2019
da0a5b6
Fix Lint
Jun 27, 2019
346ef9d
Minor Nits
Jun 28, 2019
934d65b
Revert Package lock
Jun 28, 2019
591ecb7
Revert Package lock
Jun 28, 2019
e243a34
update string
Jun 28, 2019
742557d
Minnor nits
Jun 28, 2019
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 lint
  • Loading branch information
NishealJ committed Jun 25, 2019
commit b1bbb2e85b15d4c828292135629c69fd845cf39b
8 changes: 5 additions & 3 deletions core/tests/protractor_utils/forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,16 +625,18 @@ var CodeMirrorChecker = function(elem) {
*/
var _compareTextFromLine = function(
currentLineNumber, scrollTo, Pane, compareDict) {
NishealJ marked this conversation as resolved.
Show resolved Hide resolved
/* eslint-disable */
NishealJ marked this conversation as resolved.
Show resolved Hide resolved
browser.executeScript(
"$('.CodeMirror-vscrollbar')."+ Pane +".scrollTop(" + String(scrollTo) +
"$('.CodeMirror-vscrollbar')." + Pane + ".scrollTop(" + String(scrollTo) +
');');
/* eslint-enable */
elem.getText().then(function(text) {
// The 'text' arg is a string 2n lines long representing n lines of text
// codemirror has loaded. The (2i)th line contains a line number and the
// (2i+1)th line contains the text on that line.
var textArray = text.split('\n');
//Adding an empty line at the last.
textArray[textArray.length]='';
// Adding an empty line at the last.
textArray[textArray.length] = '';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try adding reasons for some "not obvious" code in the comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added PTAL!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TextArray-->textArray. Also, I don't think this explanation is sufficient. It does not answer why we need this. Try to explain that as well.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NishealJ, you missed the latter part of the comment:

Also, I don't think this explanation is sufficient. It does not answer why we need this. Try to explain that as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done Added now

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, @NishealJ, you are not actually adding an empty line, right? An empty line would be '\n'. You're adding an empty string (or char).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I think this can be improved further:

// in codemirror5's getText() method. Therefore, we need to add an empty string at the end
// of the textArray to match with compareDict.

@DubeySandeep, thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @DubeySandeep & @apb7,
Array matches with dict i.e textArray and compareDict.
To add an empty line in compare dict we would have used a '\n' but as textArray is an array which is already split by '\n' we can just add '' to match with compare dict.
The below screenshot will help you understand the changes in getting a text of empty line from a codemirror5's Pane, you can use console.log(TextArray) to see the changes
Screenshot 2019-06-28 at 12 24 37 PM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The suggested changed looks good to me updated Thanks!

for (var i = 0; i < textArray.length; i += 2) {
var lineNumber = textArray[i];
var lineText = textArray[i + 1];
Expand Down
Loading