Commit Graph

164 Commits (mochawesome)

Author SHA1 Message Date
John McLear 7630e71957
Merge branch 'develop' into mochawesome 2021-02-03 11:23:54 +00:00
John McLear 1076783985
tests: backend test coverage for #3227 where a group cannot be deleted if it has pads. 2021-02-03 10:39:30 +00:00
freddii ea202e41f6 docs: fixed typos 2021-02-03 00:30:07 +01:00
Richard Hansen 05e0e8dbf7 hooks: New `callAllSerial()` function
This is necessary to migrate away from `callAll()` (which only
supports synchronous hook functions).
2021-02-02 09:09:02 +00:00
Richard Hansen ba0544ea9e hooks: Add unit tests for `callFirst()`, `aCallFirst()` 2021-02-02 09:09:02 +00:00
Richard Hansen ba02e70020 tests: Make the fake webaccess hook registrations look more real
The additional properties will be needed once `aCallAll()` is upgraded
to use `callHookFnAsync()`.
2021-02-02 09:09:02 +00:00
Richard Hansen 47f0a7dacf lint: Fix more ESLint errors 2021-02-02 09:09:02 +00:00
John McLear 28af41e906 Merge branch 'mochawesome' of github.com:ether/etherpad-lite into mochawesome 2021-01-30 08:11:36 +00:00
John McLear 96520a3f31 resolve conflict 2021-01-30 08:11:10 +00:00
Richard Hansen ecdb105bfe server: Refine process lifetime management
Define states and use them to properly handle multiple calls to
`start()`, `stop()`, and `exit()`. (Multiple calls to `exit()` can
happen if there is an uncaught exception or signal during shutdown.)

This should also make it easier to add support for cleanly restarting
the server after a shutdown (for tests or via an `/admin` page).
2021-01-30 08:05:08 +00:00
John McLear b2f3828f5a
Update tests/backend/specs/api/api.js
Co-authored-by: Richard Hansen <rhansen@rhansen.org>
2021-01-30 07:37:39 +00:00
John McLear 4ec538fc3c
Update tests/backend/specs/api/api.js
Co-authored-by: Richard Hansen <rhansen@rhansen.org>
2021-01-30 07:36:34 +00:00
John McLear f280a6fc8a longer timeout 2021-01-29 22:09:07 +00:00
John McLear 1dc4a2acf5 MS 2021-01-28 23:07:20 +00:00
John McLear 7f384f13cd timeouts 2021-01-28 22:52:53 +00:00
John McLear df580ec513 timeouts 2021-01-28 22:25:44 +00:00
John McLear 05fe4904ed various timeout changes 2021-01-27 21:59:06 +00:00
John McLear e8e90ac207 various timeout changes 2021-01-27 21:51:22 +00:00
John McLear 189786979f various timeout changes 2021-01-27 21:50:18 +00:00
John McLear c43de8ea59 lint and test timeouts for importexportGetPost.js 2021-01-27 21:25:23 +00:00
John McLear ac420f4683 lint and test timeouts for webaccess.js 2021-01-27 21:18:39 +00:00
John McLear 5aa0ad3f55 lint and test timeouts for specialpages.js 2021-01-27 21:18:28 +00:00
John McLear ae49fcf1ae lint and test timeouts for socketio.js 2021-01-27 21:18:17 +00:00
John McLear d12dbc7f63 lint and test timeouts for caching_middleware.js 2021-01-27 21:18:08 +00:00
John McLear fd7a7b4c6c lint and test timeouts for importexportGetPost.js 2021-01-27 21:17:58 +00:00
John McLear 6f364b065d lint and timeouts for sessionAndGroups.js 2021-01-27 20:45:40 +00:00
John McLear 3d69773cd2 lint and timeouts for pad.js 2021-01-27 20:45:31 +00:00
John McLear e5d80a0696 lint and timeouts for instance.js 2021-01-27 20:45:23 +00:00
John McLear 8fff1db4d0 lint and timeouts for importexport.js 2021-01-27 20:33:36 +00:00
John McLear 02bb5a5b73 lint and timeouts for chat.js 2021-01-27 20:30:15 +00:00
John McLear f4eeb59b86 line and timeouts for characterEncoding.js 2021-01-27 20:29:14 +00:00
John McLear 103e3398ad api.js lint and timeouts 2021-01-27 20:19:48 +00:00
John McLear ff71e41812 test timeouts for promises.js 2021-01-27 20:14:22 +00:00
John McLear 28617ee9d0 timeout for contentcollector.js 2021-01-27 20:13:04 +00:00
John McLear 7696ec0a02 Merge branch 'develop' of github.com:ether/etherpad-lite into mochawesome 2021-01-27 20:11:53 +00:00
John McLear 96d9a40b04 timeout values and low hanging lint for hooks.js 2021-01-27 20:09:05 +00:00
Richard Hansen 56f617060a tests: Fix missing call to `done` callback 2021-01-27 04:59:36 +00:00
Richard Hansen b164f9b431 tests: Replace "expected" with "want", "received" with "got"
"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").
2021-01-27 04:59:36 +00:00
Richard Hansen fc69ae78aa tests: Use `assert.deepEqual()` to simplify equality checks 2021-01-27 04:59:36 +00:00
Richard Hansen dd815892f2 tests: Delete erroneous `describe()` calls
`describe()` is meant to be used by independent tests, but the tests
in this file are not independent. Add a higher-level `describe()` call
and delete all of the `describe()` calls that wrap a single test.
2021-01-27 04:59:36 +00:00
Richard Hansen 32a0df4883 tests: Fix invalid HTML in contentcollector tests
The HTML spec does not permit `<pre>` as a child of `<p>`.
2021-01-27 04:59:36 +00:00
Richard Hansen 53160f4a21 tests: Delete invalid contentcollector test
The HTML spec doesn't allow `<ul>` to be a child of `<ol>` (it must be
a child of `<li>` instead).
2021-01-27 04:59:36 +00:00
Richard Hansen 906b2624ed tests: Re-enable import/export test that is now working 2021-01-27 04:59:36 +00:00
Richard Hansen 54a3dbb9a0 lint: Fix some straightforward ESLint errors 2021-01-27 04:59:36 +00:00
John McLear 697bfd979b use reporter 2021-01-26 11:09:22 +00:00
John McLear 44c2bc040c lint: tests/backend/specs/api/tidy.js 2021-01-25 22:53:11 -05:00
Richard Hansen 610326b496 lint: tests/backend/specs/api/importexportGetPost.js 2021-01-25 22:53:11 -05:00
John McLear f37a95cad8 timeout values 2021-01-25 21:35:47 +00:00
John McLear f0a77cb98c
lint: contentcollector and domline
Various tidy up and linting of contentcollector.js and domline.js.

3 Tests disabled which are not due to be covered.

Co-authored-by: Richard Hansen <rhansen@rhansen.org>
2021-01-22 20:41:14 +00:00
Richard Hansen ff19181cd1 lint: Fix some straightforward ESLint errors 2020-12-23 16:18:28 -05:00