2660 Commits

Author	SHA1	Message	Date
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	8afd313807	Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming. - `yarn.lock`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming.	2023-12-19 20:06:32 +01:00
Claire	6fed0fcbaa	Remove unneeded settings cleanup from specs (#28425)	2023-12-19 15:17:22 +00:00
Matt Jankowski	c7c727994a	Add spec for CLI::Maintenance#fix_duplicates (#28326)	2023-12-19 13:10:33 +00:00
Eugen Rochko	b5ac61b2c5	Change algorithm of follow recommendations (#28314) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-12-19 10:59:43 +00:00
Matt Jankowski	c28976d89e	Handle negative offset param in api/v2/search (#28282)	2023-12-19 10:55:39 +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
Matt Jankowski	476d1237d4	Typo fix in json ld helper spec (#28417)	2023-12-18 16:47:22 +00:00
Claire	7d9b209fe8	Fix call to inefficient delete_matched cache method in domain blocks (#28374)	2023-12-18 16:14:43 +00:00
Matt Jankowski	af366f65ee	Add spec coverage for models/form/custom_emoji_batch class (#28388)	2023-12-18 12:41:37 +00:00
Matt Jankowski	1820bad646	Fix Performance/StringIdentifierArgument cop (#28399)	2023-12-18 10:26:09 +00: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	ddf3ad9541	Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main ... Conflicts: - `package.json`: Upstream removed a dependency textually close to a glitch-only dependency. Updated as upstream while keeping our dependency.	2023-12-17 17:43:30 +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	db897eaa5a	Unwind map on single-item array in spec/services/delete_account_service spec (#28358)	2023-12-14 14:07:54 +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	8a3d8c6c14	Remove the stub_stdout wrapper around CLI specs (#28340)	2023-12-13 10:14:19 +00:00
Claire	89a496b42f	Fix status edits not always being streamed to mentioned users (#28324)	2023-12-12 10:39:21 +00:00
Matt Jankowski	b5a1013ae3	Combine CLI::... spec example subjects (#28285)	2023-12-11 10:23:45 +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
Matt Jankowski	11d2bd9716	Fix intermittent failure from unspecified order in api/v1/accounts/relationships spec (#28306)	2023-12-11 07:55:07 +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	a3cbb4b2f1	Add spec for CLI::Search#deploy command (#28272)	2023-12-08 13:54:20 +00:00
Matt Jankowski	8de86eabbf	Add spec for CLI::Domains#crawl command (#28271)	2023-12-08 09:51:57 +00:00
Matt Jankowski	7e514688b3	Convert api/v2/search controller spec to request spec (#28269)	2023-12-08 09:27:33 +00:00
Matt Jankowski	8d8ae05a18	Add spec coverage for CLI::Media#lookup command (#28266)	2023-12-07 15:27:41 +00:00
Matt Jankowski	ad34d33bfd	Formalize some patterns in cli specs (#28255)	2023-12-07 13:49:14 +00:00
Matt Jankowski	0b4a3a0437	Remove remaining without_partial_double_verification usage (#28127)	2023-12-07 12:15:50 +00:00
Claire	658ad7a6ca	Fix flaky tests related to file creation (#28248)	2023-12-06 22:22:25 +00:00
Matt Jankowski	0e8ba19113	Add spec coverage for CLI::Emoji class (#28182)	2023-12-06 08:52:30 +00:00
Matt Jankowski	ed7b5c091b	Remove double subject call in services/delete_account_service spec (#28212)	2023-12-06 08:51:09 +00:00
Matt Jankowski	be6bb1a10d	Remove double subject call in services/suspend_account_service spec (#28213)	2023-12-06 08:45:19 +00:00
Matt Jankowski	5517df61de	Remove double subject call in services/activitypub/process_account_service spec (#28214)	2023-12-06 08:44:51 +00:00
Matt Jankowski	faffd81976	Remove double subject call in services/unsuspend_account_service spec (#28215)	2023-12-06 08:44:07 +00:00
Matt Jankowski	89a8e6e622	Remove 2x double subject call in models/form/account_batch spec (#28209)	2023-12-04 15:41:43 +00:00
Matt Jankowski	71e5a16eba	Remove triple subject call in api/v1/lists spec (#28210)	2023-12-04 15:28:19 +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	b3b009e6aa	Add spec coverage for CLI::EmailDomainBlocks commands (#28181)	2023-12-04 09:44:54 +00:00
Matt Jankowski	9603198982	Add spec coverage for CLI::Domains#purge command (#28179)	2023-12-04 09:09:05 +00:00
Matt Jankowski	1bf2230fd1	Add spec coverage for CLI::Upgrade#storage_schema command (#28180)	2023-12-04 09:08:47 +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	5631f139c1	Fix Lint/SymbolConversion cop (#28175)	2023-12-01 15:53:35 +00:00
Matt Jankowski	aa8563d43d	Fix Style/SuperWithArgsParentheses cop (#28174)	2023-12-01 15:53:15 +00:00
Matt Jankowski	1564799952	Add spec coverage for media CLI refresh command (#28166)	2023-12-01 14:18:45 +00:00
Matt Jankowski	7753e5f715	Add shared example for CLI command specs (#28165)	2023-12-01 12:00:34 +00:00
Matt Jankowski	92fa9b109f	Add spec coverage for media CLI usage command (#28167)	2023-12-01 11:56:47 +00:00
Matt Jankowski	440b80b2e7	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
Matt Jankowski	b751078fcd	Eliminate double subject call in admin/ controller specs (#28158)	2023-12-01 10:38:15 +00:00
Matt Jankowski	1f1c75bba5	File cleanup/organization in controllers/concerns (#27846)	2023-11-30 14:39:41 +00:00
Matt Jankowski	0530ce5e95	Convert accounts controller spec to request spec (#28126)	2023-11-30 14:28:05 +00:00
Matt Jankowski	e7c340a634	Spec coverage for missing q param and error conditions in api/v2/search controller (#27842)	2023-11-30 13:59:46 +00:00
Claire	85662a5a57	Change img-src and media-src CSP directives to not include https: (#28025)	2023-11-30 13:47:01 +00:00
Matt Jankowski	bb0efe16e6	Remove default_scope from MediaAttachment class (#28043)	2023-11-30 13:30:35 +00:00
Matt Jankowski	ce78a9c9ac	Clean up two_factor_authentication/confirmations controller spec (#28128)	2023-11-30 11:44:42 +00:00
Filippo Giunchedi	e6fd9a59e6	Fix FamiliarFollowersController test response comparison (#28121) ... Co-authored-by: Filippo Giunchedi <filippo@debian.org>	2023-11-30 10:58:40 +00:00
Matt Jankowski	e48ecd2929	Remove default_scope from Admin::ActionLog (#28026)	2023-11-29 10:39:59 +00:00
Matt Jankowski	291dc04e67	Remove un-needed action and template options to render in controllers (#28022)	2023-11-29 10:38:05 +00:00
Emelia Smith	603b245cc6	Add VAPID public key to instance serializer (#28006) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2023-11-29 08:34:36 +00:00
Matt Jankowski	6b46bf9953	Handle scenario when webfinger response subject is missing host value (#28088)	2023-11-28 18:37:54 +00:00
Claire	660372d130	Revert recent CSP changes (#2485) ... * Revert "Fix image and media loading when using external storage server" This reverts commit 6cfa0245ca. * Revert "Change glitch-soc's CSP config to match upstream's closer (#2474)" This reverts commit d59196e170.	2023-11-26 15:32:35 +01:00
Matt Jankowski	19baf22683	Add missing email previews for AdminMailer (#28044)	2023-11-23 12:32:50 +00:00
Kevin Bongart	7877fcd83c	Deduplicate IDs in relationships and familiar_followers APIs (#27982)	2023-11-23 10:00:09 +00:00
Matt Jankowski	973597c6f1	Consolidate configuration of Sidekiq::Testing.fake! setup (#28046)	2023-11-23 09:43:43 +00:00
Matt Jankowski	9742bccbe7	Add coverage for api/v2/media endpoint (#28027)	2023-11-22 15:39:34 +00:00
Eugen Rochko	cdc57c74b7	Fix unsupported time zone or locale preventing sign-up (#28035) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-22 11:38:07 +00:00
Matt Jankowski	67fd3187b3	Update rspec fixture path config to silence deprecation warning (#28018)	2023-11-21 15:51:40 +00:00
Matt Jankowski	30ee4aaff4	Convert measurement api/v1/admin/* controller specs to request specs (#28005)	2023-11-21 14:25:07 +00:00
Matt Jankowski	32e19e3af6	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
Matt Jankowski	f7cb64a184	Add coverage for settings/privacy controller (#28000)	2023-11-21 13:02:37 +00:00
Claire	6cfa0245ca	Fix image and media loading when using external storage server ... Fixes #2479	2023-11-21 13:45:29 +01:00
Matt Jankowski	b2e8af8889	Add coverage for settings/verifications controller (#28001)	2023-11-21 11:00:22 +00:00
Matt Jankowski	6d51ac246b	Update partials for the AdminMailer.new_trends mailer (#28011)	2023-11-21 10:52:20 +00:00
Matt Jankowski	a6d446e6a7	Add coverage for remote_interaction_helper (#28002)	2023-11-21 10:28:55 +00:00
Claire	d59196e170	Change glitch-soc's CSP config to match upstream's closer (#2474)	2023-11-20 13:02:49 +01:00
Matt Jankowski	876f5b1d12	Convert /instances/* controller specs to request specs (#27988) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-20 11:05:28 +00:00
Matt Jankowski	718c95e7af	Convert api/v1/custom_emojis controller spec to request spec (#27985) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-20 11:05:24 +00:00
Claire	c260a68f54	Clean up some Mastodon::CLI::Accounts tests (#27473)	2023-11-20 10:46:02 +00:00
Matt Jankowski	17582d36d5	Convert api/v1/preferences controller spec to request spec (#27987)	2023-11-20 09:39:45 +00:00
Matt Jankowski	9a01a260a0	Convert api/v1/scheduled_statuses controller spec to request spec (#27986)	2023-11-20 09:36:49 +00:00
Matt Jankowski	b9fb47aeb1	Convert api/v1/endorsements controller spec to request spec (#27984)	2023-11-20 09:32:28 +00:00
Matt Jankowski	371f355719	Reduce .times usage in AccountStatusesCleanupPolicy (#27947)	2023-11-20 09:08:54 +00:00
Matt Jankowski	d2aacea8da	Reduce .times usage in AccountSearch spec, use constant for default limit (#27946)	2023-11-20 09:08:22 +00:00
Matt Jankowski	00c6ebd86f	Reduce .times usage in StatusPin and add PIN_LIMIT constant in validator (#27945)	2023-11-20 09:07:25 +00:00
Matt Jankowski	1fabf20a88	Reduce .times usage in lib/mastodon/cli/accounts spec (#27944)	2023-11-20 09:04:46 +00:00
Matt Jankowski	09a2db3f6c	Move api/v2/filters spec to correct path location (#27950)	2023-11-20 08:48:56 +00:00
Matt Jankowski	e892efbc40	Configure elastic search integration with rspec tag (#27882)	2023-11-17 11:52:20 +00:00
Claire	297839c10c	Rewrite /api/v1/statuses tests as request specs (#27891)	2023-11-17 11:36:04 +00:00
Claire	9257737675	Rewrite /api/v1/accounts tests as request specs (#27888)	2023-11-17 11:34:49 +00:00
Matt Jankowski	549e8e7baf	Add email_spec and speedup/cleanup to spec/mailers (#27902)	2023-11-17 09:50:19 +00:00
Matt Jankowski	1526e54ac6	Add spec coverage for workers/redownload_* worker classes (#27892)	2023-11-17 09:03:46 +00:00
Matt Jankowski	cb1a4a8713	Reduce expectations for RSpec/MultipleExpectations cop in spec/presenters specs (#27881)	2023-11-16 14:37:52 +00:00
Matt Jankowski	155fb84141	Improve spec coverage for collection of workers/ classes (#27874)	2023-11-16 14:36:59 +00:00
Matt Jankowski	8a285413f7	Reduce expectations for RSpec/MultipleExpectations cop in MoveWorker spec (#27880)	2023-11-16 10:03:51 +00:00
Matt Jankowski	3f0c1566c3	Reduce expectations for RSpec/MultipleExpectations cop in api/v1/accounts/relationships spec (#27879)	2023-11-16 09:55:50 +00:00
Matt Jankowski	c1f93def40	Reduce expectations for RSpec/MultipleExpectations cop in controllers/statuses spec (#27875)	2023-11-16 09:54:51 +00:00
Matt Jankowski	04121bd020	Disable simplecov enable_coverage_for_eval option, move to standalone file (#27869)	2023-11-15 23:09:31 +00:00
Matt Jankowski	3de9145613	Move controller specs for well-known endpoints to request specs (#27855)	2023-11-15 19:12:02 +00:00
Matt Jankowski	12a5b7391d	Add spec for well known change password endpoint (#27856)	2023-11-15 13:21:18 +00:00
Matt Jankowski	fe58ac8d9f	Improve spec coverage for api/web/push_subscriptions controller (#27858) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-15 13:14:51 +00:00
Matt Jankowski	7c72944661	Use Lcov simplecov formatter on CI and HTML elsewhere (#27859)	2023-11-15 09:11:02 +00:00
Nick Schonning	36d7d1781f	Add CodeCov for Ruby coverage reports (#23868)	2023-11-14 16:53:38 +00:00
Matt Jankowski	b2c5b20ef2	Fix RSpec/AnyInstance cop (#27810)	2023-11-14 14:52:59 +00:00
Matt Jankowski	d562fb8459	Specs for minimal CSP policy in Api:: controllers (#27845)	2023-11-14 14:34:30 +00:00
Matt Jankowski	5e2ecc736d	Remove double subject in api/v1/accounts/relationships spec (#27839)	2023-11-14 10:29:33 +00:00
Matt Jankowski	b7807f3d84	Use normalizes to prepare Webhook#events value (#27605)	2023-11-13 22:47:44 +00:00
Matt Jankowski	49ba5a9f94	Use hash_including to check AccountFilter setup in admin/accounts controller spec (#27838)	2023-11-13 16:01:24 +00:00
Matt Jankowski	a36b59be8a	Spec coverage for api/v1/trends controllers (#27837)	2023-11-13 14:32:36 +00:00
Claire	07a4059901	Add support for invite codes in the registration API (#27805)	2023-11-13 13:27:00 +00:00
Eugen Rochko	0d14fcebae	Change link previews to keep original URL from the status (#27312)	2023-11-13 09:58:28 +00:00
Matt Jankowski	9dc3ce878b	Speed-up in Settings:: controllers specs (#27808)	2023-11-10 15:13:42 +00:00
Matt Jankowski	e79bf1b1e7	Minor speed improvement on controllers/accounts spec (#27679)	2023-11-09 16:21:11 +00:00
Claire	c451bbe249	Allow viewing and severing relationships with suspended accounts (#27667)	2023-11-09 14:50:25 +00:00
Matt Jankowski	548bb30b2a	Consolidate html page title output logic into helper (#27563)	2023-11-09 13:05:57 +00:00
Matt Jankowski	63c9102f8a	Fix RSpec/MessageChain cop (#27776)	2023-11-09 12:57:23 +00:00
Matt Jankowski	c9204b792c	Fix Rails/I18nLocaleTexts cop (#27779)	2023-11-09 09:46:39 +00:00
Matt Jankowski	69d00e2721	Fix RSpec/InstanceVariable cop (#27766)	2023-11-08 15:42:30 +00:00
Matt Jankowski	4329616c53	Ignore block result of send method and remove rubocop:disable in deepl spec (#27741)	2023-11-08 14:43:17 +00:00
Matt Jankowski	b05575e242	Move RSpec config for streaming/search managers to be near classes (#27761)	2023-11-08 13:04:17 +00:00
Matt Jankowski	ce91d14d48	Fix Style/WordArray cop (#27770)	2023-11-08 13:03:44 +00:00
Matt Jankowski	c03bd2a238	Don't stub SUT in FollowLimitValidator spec (#27760)	2023-11-08 12:49:46 +00:00
Matt Jankowski	9b7b4d748f	Simplify request cache spec shared examples (#27673)	2023-11-08 12:37:29 +00:00
Claire	23e32a4b30	Fix format-dependent redirects being cached regardless of requested format (#27632)	2023-11-08 10:31:05 +00:00
Matt Jankowski	e545978076	Use framework helpers instead of i-vars in controller specs (#27767)	2023-11-08 08:17:43 +00:00
Matt Jankowski	ee57bb4b44	Account statuses filter spec speedup (#27674)	2023-11-07 15:47:01 +00:00
Matt Jankowski	ae7c20b00c	Move search and streaming spec manager classes to separate support files (#27727)	2023-11-07 15:25:49 +00:00
Matt Jankowski	370802ce48	Add coverage for CLI::Maintenance#fix_duplicates command (#25252)	2023-11-07 15:21:58 +00:00
Matt Jankowski	1d51e10510	Consolidate JSON parsing in serializers specs (#27693)	2023-11-07 15:20:24 +00:00
Matt Jankowski	a688a9ed20	Use strings instead of numeric literals and remove rubocop:disable in cache spec (#27742)	2023-11-07 15:20:00 +00:00
Matt Jankowski	dc0bf87090	Remove unused before block from settings/branding spec (#27759)	2023-11-07 15:19:17 +00:00
Matt Jankowski	45770c9306	Fix Performance/MapMethodChain cop (#27744)	2023-11-07 13:01:09 +00:00
Matt Jankowski	49e2772064	Fix RSpec/MessageSpies cop (#27751)	2023-11-07 09:46:28 +00:00
Matt Jankowski	2862ad701f	Stub controller methods and remove rubocop:disable in captcha feature spec (#27743)	2023-11-07 09:15:30 +00:00
Matt Jankowski	cfa14ec6d1	Fix Lint/EmptyBlock cop (#27748)	2023-11-07 09:11:04 +00:00