Fix tests during edit - Ready for Review / Merge @muxator #3745

JohnMcLear · 2020-03-22T17:42:40Z

When the test framework requested bold.js it would serve the swap file before the bold.js file causing developers to get confused as to why their changes to spec files weren't being represented upon page refresh. To fix I remove swap files from the list of files used by Etherpad.

Also....

Tests: What's changed and why?

Now our Sauce Labs tests worked it seemed like a suitable time to fix tests which over the years have become broken due to browser changes.

Reduce duplicate code. https://github.com/ether/etherpad-lite/pull/3745/files#diff-1f128f89d031a5ed781ca8474c46c7cb -- Fixing all browser inconsistency on testing keypress/down events.
Comment out tests that are broken (scroll.js) and create separate issue to resolve them.
Fix issue where firefox keeps line breaks in .text() values.

Also you might want to squash these commits.

JohnMcLear · 2020-03-22T17:43:27Z

Not sure why the sauce labs commit is in? :D Anyway, this is the fix for the issue experienced in #3730

…x tests This is a bit of a hack, because it appears that getSelection() behaviour is not consistent across browsers.

Because I can't get enter keypress to simulate properly despite trying various approaches.

muxator · 2020-03-23T21:24:11Z

Not sure why the sauce labs commit is in? :D Anyway, this is the fix for the issue experienced in #3730

I came here to say it... by mistake this series was based on the saucelab enablement branch #3743.
I'll have to rebase it. It's a bit nasty to do this in the public repository, but this is a secondary branch after all.

If possible, I'd prefer PR based on private repos so they can be meddled with.

JohnMcLear · 2020-03-23T21:35:31Z

Yea see comment on other PR, it's because I'm working on sauce labs which means I have to commit to ether/ to get the travis runner to init

muxator · 2020-03-23T21:50:00Z

After this one, #3743 and #3749 are merged it would be better if you start over from a new clone, because otherwise there will be dragons ahead. I'll ping you.

JohnMcLear · 2020-03-23T22:35:42Z

Yea that's fine, let's get these in so we can keep moving on. Once these are done nearly all future commits will land from JohnMcLear/

JohnMcLear · 2020-03-23T23:00:00Z

Can this get merged in or do you want a new clone? I don't see any conflicts but I'm mindful of # of commits. (afaik you can squash these on merge)

muxator · 2020-03-23T23:11:48Z

do you want a new clone?

Not for this PR. It's not worth the effort since I'll have to rewrite the branch and delete it anyway.

After everything it's merged, I advise you to re-clone the repo on your dev machine because otherwise you'll likey will see fun stuff happening. :)

muxator · 2020-03-23T23:34:18Z

tests/frontend/specs/helper.js

@@ -136,7 +136,7 @@ describe("the test helper", function(){
 helper.selectLines($startLine, $endLine, startOffset, endOffset);

 var selection = inner$.document.getSelection();
- expect(cleanText(selection.toString())).to.be("ort lines to t");
+ expect(cleanText(selection.toString().replace(/(\r\n|\n|\r)/gm,""))).to.be("ort lines to t");


This is logically part of the next commit where you do the same in other places, right?

I'll move it there and comment from that point.

To be clear, I am referring to this: 6a7bcfd

I'm terrible at committing, I drank too much of the "commit often" juice.. 💯 Sorry about that! At least I show my work tho, I like to show how dumb I can be / how my brain goes about solving / sorting things so when I have to fix something (in this case 6 years later?) I can see what I was trying to do and why I did something weird.

I do a lot of weird. But that's okay 🍡

No problem. I'm just trying to make sure we won't get lost in another 6 years... :)

This is a followup on 312c72c, which did the same on the main code base, and is preliminary work for tidying up John's changes in the following commits. No functional changes. Command: find tests/frontend -name '*.js' -type f -print0 | xargs -0 sed --in-place 's/[[:space:]]*$//'

This helps during plugin development, which otherwise which break when a developer is editing a test.

muxator · 2020-03-24T00:23:12Z

Geez, that's a lot of work you have done! I'll continue tomorrow.

JohnMcLear · 2020-03-24T19:41:04Z

@muxator thanks, lemme know if you get stuck, I have some more tests to merge / send PR for and I don't want to work against a volatile code base.

muxator · 2020-03-24T22:24:23Z

I am taking these, with just a minimum rewrite.

I still have some doubts, but I understand you are still working on it and I do not want to block your progress.

Pulled in, thanks.

JohnMcLear mentioned this pull request Mar 22, 2020

ui: Initialize color picker with user's color #3730

Merged

JohnMcLear added 12 commits March 22, 2020 18:19

tests: hopefully fixed all tests to be working in edge

dd65ecb

tests: fix IE undo test

9f91612

tests: Firefox suport for undo keypress

cd4b8b9

tests: increase helper timeout

dfb0156

tests: remove white space from getSelection(). This HACK fixes Firefo…

838a5bf

…x tests This is a bit of a hack, because it appears that getSelection() behaviour is not consistent across browsers.

tests: re-enable test for undo

19209c4

tests: use helper for evttype to reduce duplicate code

30b0b71

tests: fix redo

70c115e

tests: some scroll tests fixed

1aa1507

tests: don't run specific tests in Edge that simulate enter keypress

8b4eabf

Because I can't get enter keypress to simulate properly despite trying various approaches.

tests: increase timeout

cbf2fc7

tests: disable a scroll test that needs to be looked at

a472754

JohnMcLear mentioned this pull request Mar 23, 2020

Fix the scroll tests #3748

Closed

JohnMcLear changed the title ~~Fix tests during edit~~ Fix tests during edit - Ready for Review / Merge @muxator Mar 23, 2020

muxator force-pushed the fix-tests-during-edit branch 2 times, most recently from 170ef9c to 1a26260 Compare March 23, 2020 21:47

muxator mentioned this pull request Mar 23, 2020

Testing travis ci sauce labs - Ready for Review / Merge @muxator #3743

Merged

6 tasks

muxator reviewed Mar 23, 2020

View reviewed changes

muxator force-pushed the fix-tests-during-edit branch from 1a26260 to aec360e Compare March 23, 2020 23:54

muxator and others added 2 commits March 24, 2020 01:04

tests: ignore vim swap files

4f2ea48

This helps during plugin development, which otherwise which break when a developer is editing a test.

muxator force-pushed the fix-tests-during-edit branch from aec360e to 22cd739 Compare March 24, 2020 00:21

muxator force-pushed the fix-tests-during-edit branch from 22cd739 to a472754 Compare March 24, 2020 22:20

muxator merged commit 3c78ada into develop Mar 24, 2020

muxator deleted the fix-tests-during-edit branch March 24, 2020 22:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix tests during edit - Ready for Review / Merge @muxator #3745

Fix tests during edit - Ready for Review / Merge @muxator #3745

JohnMcLear commented Mar 22, 2020 •

edited

Loading

JohnMcLear commented Mar 22, 2020

muxator commented Mar 23, 2020 •

edited

Loading

JohnMcLear commented Mar 23, 2020

muxator commented Mar 23, 2020

JohnMcLear commented Mar 23, 2020

JohnMcLear commented Mar 23, 2020

muxator commented Mar 23, 2020

muxator Mar 23, 2020

muxator Mar 23, 2020

JohnMcLear Mar 23, 2020

JohnMcLear Mar 23, 2020

muxator Mar 23, 2020

muxator commented Mar 24, 2020

JohnMcLear commented Mar 24, 2020

muxator commented Mar 24, 2020 •

edited

Loading

Fix tests during edit - Ready for Review / Merge @muxator #3745

Fix tests during edit - Ready for Review / Merge @muxator #3745

Conversation

JohnMcLear commented Mar 22, 2020 • edited Loading

JohnMcLear commented Mar 22, 2020

muxator commented Mar 23, 2020 • edited Loading

JohnMcLear commented Mar 23, 2020

muxator commented Mar 23, 2020

JohnMcLear commented Mar 23, 2020

JohnMcLear commented Mar 23, 2020

muxator commented Mar 23, 2020

muxator Mar 23, 2020

Choose a reason for hiding this comment

muxator Mar 23, 2020

Choose a reason for hiding this comment

JohnMcLear Mar 23, 2020

Choose a reason for hiding this comment

JohnMcLear Mar 23, 2020

Choose a reason for hiding this comment

muxator Mar 23, 2020

Choose a reason for hiding this comment

muxator commented Mar 24, 2020

JohnMcLear commented Mar 24, 2020

muxator commented Mar 24, 2020 • edited Loading

JohnMcLear commented Mar 22, 2020 •

edited

Loading

muxator commented Mar 23, 2020 •

edited

Loading

muxator commented Mar 24, 2020 •

edited

Loading