110 commits

Author	SHA1	Message	Date
Claire	15bc13c65b	Merge commit '2954279e9c' into glitch-soc/merge-upstream	2024-01-11 20:15:19 +01:00
Matt Jankowski	2954279e9c	Remove double subject call in api/v1/admin/trends/links/links spec (#28695)	2024-01-11 15:13:11 +00:00
Matt Jankowski	95bd46d32a	Remove double subject call in api/v1/admin/ip_blocks spec (#28696)	2024-01-11 15:11:57 +00:00
Claire	23d8bd8ce1	Merge commit '0a7cff53c2' into glitch-soc/merge-upstream	2024-01-11 13:24:20 +01:00
Matt Jankowski	00341c70ff	Use Sidekiq fake! instead of inline! in specs (#25369)	2024-01-10 11:06:58 +00:00
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
Claire	f5b7307890	Merge commit 'f99e05710e' 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 '4a7395d989' 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
Claire	077e0c6812	Merge commit '0b4a3a0437' 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	b135b6ba8f	Merge commit '8ebc94dd22' 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	6c00d5b0c4	Fix test failure caused by glitch-soc changes	2023-12-19 21:14:39 +01:00
Claire	2e786e13cb	Merge commit '973597c6f1' 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 '12c22ee5e7' into glitch-soc/merge-upstream	2023-12-19 20:40:05 +01:00
Claire	b24f676cf1	Merge commit '1526e54ac6' into glitch-soc/merge-upstream	2023-12-19 20:24:57 +01:00
Claire	6fed0fcbaa	Remove unneeded settings cleanup from specs (#28425)	2023-12-19 15:17:22 +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
Claire	a111fd7a0b	Merge commit 'b2c5b20ef2' into glitch-soc/merge-upstream	2023-12-18 20:47:27 +01:00
Claire	b474cbbd28	Merge commit '7840c6b75b' 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	4113fbf6e8	Merge commit 'f476d9dab2' 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
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	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 '2e6bf60f15' 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	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
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	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	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
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
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	3f0c1566c3	Reduce expectations for RSpec/MultipleExpectations cop in api/v1/accounts/relationships spec (#27879)	2023-11-16 09:55:50 +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
Claire	c451bbe249	Allow viewing and severing relationships with suspended accounts (#27667)	2023-11-09 14:50:25 +00:00
Matt Jankowski	949f5eb860	Fix RSpec/MetadataStyle cop in spec/ (#27729)	2023-11-06 14:28:20 +00:00