0c690511c2
Convert `auth/challenges` spec controller->request ( #33495 )
2025-01-08 08:54:08 +00:00
b6c2923cf7
Convert `settings/migration` spec controller->system ( #33496 )
2025-01-08 08:53:26 +00:00
c0264c8013
Extend custom CSS cache time with digest paths ( #33207 )
2025-01-08 08:48:45 +00:00
b3243ef41c
Refer to constant values from `api/v1/apps` request spec ( #33488 )
2025-01-07 16:28:54 +00:00
7ad44e22ed
Remove role color highlighting from custom css ( #33493 )
2025-01-07 16:28:35 +00:00
efcd4ea5de
Reference value constants from specs ( #33479 )
2025-01-06 23:25:13 +00:00
68106f250c
Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream
2025-01-03 12:34:47 +01:00
7cbdcd7b3f
Add role-specific user fabricators ( #33437 )
2025-01-03 08:28:14 +00:00
0aa69487a2
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
d65e246192
Convert `statuses#activity` action controller to request spec ( #33336 )
2024-12-17 16:37:30 +00:00
1712543c68
Revert "Support animated PNGs in media attachments ( #28516 )" ( #33334 )
2024-12-17 10:52:59 +00:00
60bb51eef8
Convert `filters` spec controller->system ( #33326 )
2024-12-17 09:20:01 +00:00
a70ae28644
Support animated PNGs in media attachments ( #28516 )
2024-12-11 02:28:21 +00:00
30aa0df88c
Add terms of service ( #33055 )
2024-12-09 10:04:46 +00:00
72a4da83fd
Merge duplicate custom css request specs ( #33204 )
2024-12-06 18:55:47 +00:00
86b45a4a48
Add rel alternate rss/json links to tags show html page ( #33179 )
2024-12-05 11:34:49 +00:00
0fcf227a92
Add media attachment description limit to instance API response ( #33153 )
2024-12-04 15:10:20 +00:00
c2817c7fad
Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Upstream changed how notifications from follow subscriptions were handled,
refactoring this file in the process.
Conflict is due to glitch-soc having an extra timeline type (direct).
Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
Ditto.
2024-12-02 21:08:15 +01:00
752d49eefe
Add coverage for `api/v1/push/subscriptions#show` action ( #33134 )
2024-12-02 15:08:41 +00:00
7d52d5df0f
Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Conflict due to upstream adding fallback support for MathML Core while
glitch-soc supported slightly more tags than upstream.
Added the MathML Core fallback code to glitch-soc.
- `spec/lib/sanitize/config_spec.rb`:
Ditto.
2024-12-01 18:22:00 +01:00
48f3ed738f
Fix list error messages ( #33082 )
2024-11-28 10:13:06 +00:00
f740611820
Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream
2024-11-24 18:56:15 +01:00
4517e18b79
Update dependency doorkeeper to v5.8.0 ( #33000 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-21 13:48:30 +00:00
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
2bd56f726a
Add client_secret_expires_at to OAuth Applications ( #30317 )
2024-11-12 22:06:13 +00:00
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
e1b7382ea6
Add userinfo oauth endpoint ( #32548 )
2024-10-30 14:38:10 +00:00
d94a367aeb
Add test coverage for POST /api/v2/media's max description length ( #32683 )
2024-10-29 09:25:38 +00:00
9074c1fac9
Use `likes` and `shares` totalItems on status creations and updates ( #32620 )
2024-10-28 04:55:18 +00:00
8103e69b17
Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict caused by glitch-soc changing the path to images, and upstream
removing styling using such an image.
Removed the styling as upstream did.
- `app/models/account.rb`:
Conflict due to upstream changing lines adjacent to a change made in glitch-soc
to have configurable limits.
Ported upstream's changes.
- `yarn.lock`:
Dependencies adjacent to glitch-soc-only dependencies updated.
Updated them as well.
2024-10-26 13:38:07 +02:00
05f23df3b7
Add endpoint to remove web push subscription ( #32626 )
2024-10-23 08:02:31 +00:00
67403e7b01
Add coverage for ActivityPub likes/shares endpoints ( #32305 )
2024-10-23 06:41:07 +00:00
0a4a73f9a6
Add coverage for `api/v1/domain_blocks/preview` endpoint ( #32303 )
2024-10-23 06:40:29 +00:00
6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while glitch-soc
has a different version of the file overall.
Added upstream's changes.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
28131b4b00
Convert status embed controller to request spec ( #32448 )
2024-10-15 14:18:20 +00:00
7e06d724c9
Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream
2024-10-07 20:45:07 +02:00
4238da6ee3
Add error message when user tries to follow their own account ( #31910 )
2024-10-07 12:05:46 +00:00
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
cc8d723e71
Register an XML encoder for response tests ( #32220 )
2024-10-03 13:10:27 +00:00
33d3ca7cf1
Support /.well-known/host-meta.json ( #32206 )
2024-10-02 09:23:44 +00:00
e6cda8388c
Move OTP secret length to configuration ( #32125 )
2024-10-01 09:38:42 +00:00
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
cdd7526531
Remove completed TODO note in tags request spec ( #32108 )
2024-09-27 08:22:40 +00:00
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
28966fa0a6
Remove deprecated `v2_alpha` endpoint for grouped notifications ( #32089 )
2024-09-25 15:21:11 +00:00
51777fe3e2
Prefer structure checks over multi-line size/parts checks in `parsed_body` ( #32063 )
2024-09-25 13:54:22 +00:00
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
5dfdec6453
Convert `settings/applications` controller spec to system/request specs ( #32006 )
2024-09-23 13:37:32 +00:00
2b4bda8004
Add `response_avatar_link` helper to webfinger request spec ( #31999 )
2024-09-23 10:44:52 +00:00
447d0a3e88
Remove double no-records cases in `api/v1/admin` req specs ( #32014 )
2024-09-23 09:27:53 +00:00
66ed7ea4b5
Move status creation to "with rss" context in accounts request spec ( #32020 )
2024-09-23 09:20:43 +00:00
0ba3ad4a35
Remove `body_json_ids` from api/v2/admin/accounts spec ( #32003 )
2024-09-23 08:45:05 +00:00
e0b45b35c9
Combine repeated parsed_body assertions into single ( #32002 )
2024-09-23 08:42:52 +00:00
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
d55f4fbda1
Add content type checks to api/v2 request specs ( #31983 )
2024-09-20 13:19:53 +00:00
171394e914
Add coverage for CSV responses for severed relationships ( #31962 )
2024-09-20 13:13:47 +00:00
66326065b0
Add `response.content_type` checks for JSON to `api/v1` request specs ( #31981 )
2024-09-20 13:13:04 +00:00
9a03902ab6
Capture actual behavior in v2/notifications "someone else" dismiss scenario ( #31985 )
2024-09-20 08:16:19 +00:00
5a8f2fe31d
Convert `settings/exports` controller spec to system/request specs ( #31965 )
2024-09-19 13:43:40 +00:00
b071e618e7
Combine API request spec assertions ( #31970 )
2024-09-19 10:15:21 +00:00
bf8eaaa9a5
Convert controller spec for security_key_options endpoint to request spec ( #31938 )
2024-09-18 09:42:36 +00:00
eb16763bff
Use `have_http_link_header` matcher in `api/v1/trends/*` specs ( #31940 )
2024-09-18 08:22:07 +00:00
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` ( #31840 )
2024-09-16 12:10:02 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive ( #26897 )
2024-09-12 13:24:19 +00:00
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
6b6a80b407
Remove `body_as_json` in favor of built-in `response.parsed_body` for JSON response specs ( #31749 )
2024-09-06 09:58:46 +00:00
7efe0bde9d
Add `have_http_link_header` matcher and set header values as strings ( #31010 )
2024-09-05 20:05:38 +00:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
e820cc30b8
Convert invites controller spec to system/request specs ( #31755 )
2024-09-05 11:54:27 +00:00
4d5c91e99a
Remove `before` block in spec with TODOs which have been TO-DONE already ( #31754 )
2024-09-04 19:51:40 +00:00
cb1eaa10f2
Fix glitch-soc-only tests
2024-09-04 20:07:23 +02:00
5a55180b95
Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
glitch-soc had differences in the first few tests because of the wider
subset of HTML it accepts.
Changed `describe` to `RSpec.describe` as upstream did, keeping
glitch-soc's tests.
2024-09-04 19:38:52 +02:00
e1b5f3fc6f
Use `response.parsed_body` for html response checks ( #31750 )
2024-09-04 17:29:05 +00:00
1fcffa573c
Fix 500 error in `GET /api/v2_alpha/notifications` when there are no notifications to return ( #31746 )
2024-09-04 12:54:15 +00:00
f1003b2560
Enable "zero monkey patching" mode in RSpec ( #31614 )
2024-09-04 05:12:25 +00:00
fef055db96
Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
c9ea91f868
Add coverage for `api/v1/annual_reports` area ( #31730 )
2024-09-03 16:10:48 +00:00
e1fa456c7c
Add `have_cacheable_headers` matcher for responses ( #31727 )
2024-09-03 15:35:19 +00:00
8922786ef4
Fix `RSpec/LetSetup` cop in api/v1/timelines/tag spec ( #30796 )
2024-09-03 15:32:12 +00:00
ef4920c6c9
Pull out https/hostname setup for request specs to shared config ( #31622 )
2024-09-03 15:28:57 +00:00
ea0d691e19
Add `GET /api/v2_alpha/notifications/:group_key/accounts` ( #31725 )
2024-09-03 14:32:26 +00:00
219458d7d4
Convert `tags` controller spec to system and request specs ( #31708 )
2024-09-03 13:18:53 +00:00
ac4002fe08
Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream
2024-09-03 12:12:23 +02:00
24a0b20408
Use `body_as_json` directly instead of via local var assignment ( #31696 )
2024-09-03 08:03:08 +00:00
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
40f993b3a0
Use built-in `response.parsed_body` for JSON response specs ( #31674 )
2024-09-02 14:25:21 +00:00
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
ad0a28a8bf
Add `grouped_types` parameter to allow clients to restrict which notifications types get grouped ( #31594 )
2024-08-29 12:39:07 +00:00
02585d8789
Convert `media` controller spec to request spec ( #31634 )
2024-08-29 08:46:00 +00:00
00586d27cb
Convert `instance_actor` controller spec to request spec ( #31621 )
2024-08-28 07:56:07 +00:00
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
48f4e5444d
Convert `media_proxy` controller spec to request spec ( #31600 )
2024-08-27 09:44:16 +00:00
a7f8417795
Convert "CSV export" settings controller specs to request specs ( #31601 )
2024-08-27 08:12:39 +00:00
38a3466741
Convert `api/oembed` controller spec to request spec ( #31605 )
2024-08-27 07:55:25 +00:00
c09d232ee3
Convert `api/web/settings` controller spec to request spec ( #31606 )
2024-08-27 07:42:35 +00:00
14d7fe05d0
Use `describe` instead of `context` in top-level spec declaration ( #31607 )
2024-08-27 07:40:18 +00:00
8f678a3cf4
Fix tests for glitch-soc
2024-08-26 19:08:42 +02:00
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
Matt Jankowski
Claire
Christian Schmidt
Eugen Rochko
Emelia Smith
Jonny Saunders
David Roetzel
Leni Kadali
Renaud Chaput