Matt Jankowski
9e78129e6e
Use "cacheable response" shared example in more places ( #29419 )
2024-02-27 11:50:21 +00:00
Claire
67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
2024-02-26 17:43:16 +01:00
Damien Mathieu
1540f42522
Better tests for auth/registrations#update ( #29303 )
2024-02-26 16:09:56 +00:00
Wolfgang Fournès
d51c3ac087
Add a missing spec to SessionsController#webauthn_options ( #29277 )
2024-02-26 16:09:40 +00:00
Claire
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
Claire
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
Claire
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
Claire
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
Claire
dfd74f0dae
Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream
2024-02-24 14:15:49 +01:00
Claire
73de36318e
Move api/v1/timelines/direct to request spec
2024-02-24 14:10:05 +01:00
Claire
9903e6beab
Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/direct_controller_spec.rb`:
`spec/controllers/api/v1/timelines` has been renamed, but we had an extra
spec here for a glitch-soc-only endpoint.
Kept glitch-soc's file unchanged (will port to a request spec later).
2024-02-24 14:05:26 +01:00
Claire
c297d999ba
Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream
2024-02-24 14:02:01 +01:00
Matt Jankowski
64f9939e39
Use capture_emails helper to improve email assertions in specs ( #29245 )
2024-02-19 15:57:47 +00:00
Matt Jankowski
1946e171e6
Reduce round trips in admin/disputes/appeals spec ( #29234 )
2024-02-16 13:46:28 +00:00
Matt Jankowski
3454fcbd71
Reduce round trips in auth/sessions spec ( #29233 )
2024-02-16 13:38:49 +00:00
Matt Jankowski
a316c0e38d
Reduce round trips in disputes/appeals spec ( #29232 )
2024-02-16 13:01:15 +00:00
Matt Jankowski
1690fb39e6
Reduce RSpec/MultipleExpectations in instance_actors_controller spec ( #29229 )
2024-02-16 13:00:11 +00:00
Matt Jankowski
da50217b88
Combine repeated requests in admin/accounts controller spec ( #29119 )
2024-02-07 10:59:32 +00:00
Matt Jankowski
2d6ab44556
Reduce request/response round-trips in ap/collections controller spec ( #29102 )
2024-02-06 13:10:00 +00:00
Matt Jankowski
4cf07ed78c
Add missing action logging to api/v1/admin/reports#update ( #29044 )
2024-02-06 11:34:11 +00:00
Matt Jankowski
f91acba70a
Combine repeated requests in account controller concern spec ( #28957 )
2024-01-30 15:32:20 +00:00
Matt Jankowski
ff8937aa2c
Move api/v1/statuses/* to request spec ( #28954 )
2024-01-26 17:45:54 +00:00
Matt Jankowski
5119fbc9b7
Move api/v1/admin/trends/links/preview_card_providers to request spec ( #28951 )
2024-01-26 17:41:39 +00:00
Matt Jankowski
b6baab447d
Move api/v2/admin/accounts to request spec ( #28950 )
2024-01-26 17:41:13 +00:00
Matt Jankowski
7adcc0aae3
Move api/v1/trends/* to request specs ( #28949 )
2024-01-26 17:40:39 +00:00
Matt Jankowski
0b0ca6f3b8
Move api/v1/timelines/list to request spec ( #28948 )
2024-01-26 17:40:15 +00:00
Matt Jankowski
685eaa04d4
Combine double subject in admin/statuses controller shared example ( #28940 )
2024-01-26 16:30:30 +00:00
Matt Jankowski
beb74fd71c
Combine double subjects in instance actors controller shared example ( #28939 )
2024-01-26 16:28:50 +00:00
Matt Jankowski
beaef4b672
Combine double subjects in application controller shared example ( #28938 )
2024-01-26 16:23:12 +00:00
Matt Jankowski
2f8656334d
Combine double subjects in admin/accounts controller spec ( #28936 )
2024-01-26 16:21:31 +00:00
Matt Jankowski
9cc1817bb4
Fix intmermittent failure in api/v1/accounts/statuses controller spec ( #28931 )
2024-01-26 14:10:26 +00:00
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
Matt Jankowski
a11a2fb052
Add error classes to api/base errors coverage ( #28864 )
2024-01-24 10:31:31 +00:00
Claire
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
Claire
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
Claire
e2d9635074
Add notification email on invalid second authenticator ( #28822 )
2024-01-22 13:55:43 +00:00
Matt Jankowski
7ecf7f5403
Move controller->request specs for api/v1/statuses/* ( #28818 )
2024-01-22 11:58:54 +00:00
Claire
3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level ( #28801 )
2024-01-19 12:19:49 +00:00
Matt Jankowski
329911b0a3
Migrate controller->request spec for api/v1/follow* ( #28811 )
2024-01-19 09:32:41 +00:00
Claire
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
2024-01-15 20:53:16 +01:00
Claire
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
Claire
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
2024-01-15 19:19:04 +01:00
Claire
e621c1c44c
Fix registrations not checking MX records for email domain blocks requiring approval ( #28608 )
2024-01-15 17:10:57 +00:00
Matt Jankowski
e72676e83a
Improve api/v1/markers#create performance against simultaneous requests ( #28718 )
2024-01-15 09:47:25 +00:00
Claire
a3b6a85521
Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Conflict due to glitch-soc-only files.
Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
Matt Jankowski
a90696011e
Add coverage/bugfix for invalid appeal submission ( #28703 )
2024-01-12 09:21:00 +00:00
Matt Jankowski
32eeca9c7b
Refresh instance counts in spec (fixes intermittent failure) ( #28698 )
2024-01-12 09:10:37 +00:00
Claire
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
2024-01-11 20:15:19 +01:00
Matt Jankowski
185c806d69
Extract spec helper for verifing to/from public AP collection namespace ( #28472 )
2024-01-11 16:17:21 +00:00
Claire
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
Matt Jankowski
87097a227c
Clean up settings/featured_tags/index view ( #28688 )
2024-01-11 10:45:26 +00:00
Matt Jankowski
55802242ce
Refactor login activity partial (remove inline ruby) ( #28687 )
2024-01-11 10:36:27 +00:00
Claire
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
Claire
d7e13e2483
Fix potential redirection loop of streaming endpoint ( #28665 )
2024-01-10 15:05:46 +00:00
Matt Jankowski
00341c70ff
Use Sidekiq fake! instead of inline! in specs ( #25369 )
2024-01-10 11:06:58 +00:00
Claire
6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs ( #28607 )
2024-01-05 11:07:57 +00:00
Claire
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
2024-01-04 09:07:05 +00:00
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
Claire
a2624ff739
Convert signature verification specs to request specs ( #28443 )
2023-12-22 18:56:22 +00:00
Matt Jankowski
513d35969e
Fix RSpec/LetSetup cop in auth controller specs ( #28464 )
2023-12-22 08:03:59 +00:00
Claire
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
Claire
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
2023-12-21 18:17:17 +01:00
Matt Jankowski
cd64a5b2ec
Clean up of RSpec/LetSetup within api/ ( #28448 )
2023-12-21 10:10:18 +00:00
Matt Jankowski
f32d672d2f
Clean up of RSpec/LetSetup within spec/controllers ( #28446 )
2023-12-21 09:28:41 +00:00
Claire
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
Claire
75580360cd
Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
`Metrics/AbcSize` cop.
Glitch-soc has different code and slightly higher `AbcSize` complexity,
modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
Upstream changed `account.suspended?` to `account.unavailable?` to prepare
for delete flags. Glitch-soc has additional local-only conditions.
Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
Upstream refactored a bunch of stuff while glitch-soc has more settings.
Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01:00
Claire
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
2023-12-20 21:58:18 +01:00
Claire
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
Claire
b135b6ba8f
Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Conflict caused by glitch-soc having a different file size limit constant
name.
Updated like upstream did while keeping glitch-soc's constant name.
2023-12-19 21:24:01 +01:00
Claire
2e786e13cb
Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_pin_validator.rb`:
Upstream refactored that file, while glitch-soc had configurable limits for
pinned statuses.
Updated the code with upstream's refactor, while keeping glitch-soc's
configurability.
2023-12-19 20:51:37 +01:00
Claire
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
2023-12-19 20:40:05 +01:00
Claire
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
2023-12-19 20:24:57 +01:00
Claire
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
2023-12-19 20:17:23 +01:00
Claire
6fed0fcbaa
Remove unneeded settings cleanup from specs ( #28425 )
2023-12-19 15:17:22 +00:00
Claire
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
Claire
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
Claire
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
2023-12-18 18:40:58 +01:00
Claire
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
Claire
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
Claire
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
Claire
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
Matt Jankowski
b1dec09d20
Fix Style/InverseMethods cop ( #28377 )
2023-12-15 15:52:00 +00:00
Matt Jankowski
ef9797a395
Un-nest contexts in settings/2fa/webauthn spec ( #28359 )
2023-12-14 10:46:43 +00:00
Matt Jankowski
adbfd40a1b
Convert api/v1/directories controller spec to request spec ( #28356 )
2023-12-14 10:38:06 +00:00
Matt Jankowski
28e1a7a394
Improve spec coverage for models/announcement class ( #28350 )
2023-12-14 10:29:10 +00:00
Matt Jankowski
0e4233de9d
Controller spec to request spec: api/v2/suggestions ( #28297 )
2023-12-11 08:13:57 +00:00
Matt Jankowski
0c64092500
Controller spec to request spec: api/v1/accounts/search ( #28299 )
2023-12-11 08:13:28 +00:00
Matt Jankowski
16ede59d0a
Controller spec to request spec: api/v1/featured_tags/suggestions ( #28298 )
2023-12-11 08:00:41 +00:00
Matt Jankowski
809506bdd4
Controller spec to request spec: api/v1/accounts/pins ( #28300 )
2023-12-11 07:59:40 +00:00
Matt Jankowski
94cc707ab3
Controller spec to request spec: api/v1/accounts/notes ( #28301 )
2023-12-11 07:58:48 +00:00
Matt Jankowski
e544b6df42
Controller spec to request spec: api/v1/accounts/lookup ( #28302 )
2023-12-11 07:57:33 +00:00
Matt Jankowski
a968898dc7
Controller spec to request spec: api/v1/accounts/lists ( #28303 )
2023-12-11 07:56:47 +00:00
Matt Jankowski
8f94502e7d
Controller spec to request spec: api/v1/accounts/identify_proofs ( #28304 )
2023-12-11 07:56:13 +00:00
Matt Jankowski
78347d2556
Controller spec to request spec: api/v1/accounts/familiar_followers ( #28305 )
2023-12-11 07:55:45 +00:00
Claire
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
Matt Jankowski
7e514688b3
Convert api/v2/search controller spec to request spec ( #28269 )
2023-12-08 09:27:33 +00:00
Matt Jankowski
cca19f5fbb
Use the Admin::ActionLog fabricator in admin/action_logs spec ( #28194 )
2023-12-04 12:56:28 +00:00
Matt Jankowski
19ad51253d
Prevent triple-subject run in admin/domain_blocks spec ( #28195 )
2023-12-04 09:02:40 +00:00
Matt Jankowski
d848d8d87c
Add helper methods for domains allow and export blocks files ( #28196 )
2023-12-04 08:52:21 +00:00
Matt Jankowski
b751078fcd
Eliminate double subject call in admin/ controller specs ( #28158 )
2023-12-01 10:38:15 +00:00
