Commit graph

3263 commits

Author SHA1 Message Date
Jeremy Kescher
0b66cfbc8d
Merge remote-tracking branch 'upstream/main' into develop
Some checks failed
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-09-10 16:15:59 +02:00
Claire
441af2632d Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream 2024-09-09 18:22:41 +02:00
Mike Dalessio
a0ea2fa3b0
Change fetch link card service to parse as HTML5 (#31814) 2024-09-09 10:59:42 +00:00
Matt Jankowski
c6a0768fe5
Use shared system spec helper methods (#31784) 2024-09-09 08:01:26 +00:00
Mike Dalessio
afa2e257e4
Change verify link service to use CSS selectors instead of a complex XPath query (#31815) 2024-09-08 18:50:22 +00:00
Claire
af6ca96a4e Fix tests in glitch-soc 2024-09-06 20:00:19 +02:00
Claire
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
Matt Jankowski
4f81ad2494
Add coverage for media#player, move body class to view (#31790) 2024-09-06 16:46:25 +00:00
Emelia Smith
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts (#31528) 2024-09-06 14:58:36 +00:00
Matt Jankowski
a9d0b48b65
Set "admin" body class from admin nested layout (#31269) 2024-09-06 13:58:46 +00:00
Matt Jankowski
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
Matt Jankowski
7efe0bde9d
Add have_http_link_header matcher and set header values as strings (#31010) 2024-09-05 20:05:38 +00:00
Matt Jankowski
09017dd8f0
Add worker spec for annual report worker (#31778) 2024-09-05 19:51:17 +00:00
Claire
1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
Matt Jankowski
5acec087ca
Simplify basic presence validations (#29664) 2024-09-05 15:36:05 +00:00
David Roetzel
f85694acfd
Add credentials to redis sentinel configuration (#31768) 2024-09-05 14:06:58 +00:00
Matt Jankowski
e820cc30b8
Convert invites controller spec to system/request specs (#31755) 2024-09-05 11:54:27 +00:00
Matt Jankowski
ba9fd1c32e
Add coverage for Account#prepare_contents callback (#31748) 2024-09-05 09:48:33 +00:00
David Roetzel
7d91723f05
Support REDIS_SENTINEL_PORT variables (#31767) 2024-09-05 09:26:49 +00:00
Matt Jankowski
4d5c91e99a
Remove before block in spec with TODOs which have been TO-DONE already (#31754) 2024-09-04 19:51:40 +00:00
Claire
cb1eaa10f2 Fix glitch-soc-only tests 2024-09-04 20:07:23 +02:00
Claire
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
Matt Jankowski
e1b5f3fc6f
Use response.parsed_body for html response checks (#31750) 2024-09-04 17:29:05 +00:00
David Roetzel
ef2bc8ea26
Add redis sentinel support to ruby part of code (#31744) 2024-09-04 14:10:45 +00:00
Claire
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
Matt Jankowski
14af5b47ac
Add coverage for model normalizations (#31734) 2024-09-04 05:12:40 +00:00
Matt Jankowski
9ed1aab9b7
Remove accidental matcher debug code (#31732) 2024-09-04 05:12:35 +00:00
Matt Jankowski
f1003b2560
Enable "zero monkey patching" mode in RSpec (#31614) 2024-09-04 05:12:25 +00:00
Claire
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
Matt Jankowski
c9ea91f868
Add coverage for api/v1/annual_reports area (#31730) 2024-09-03 16:10:48 +00:00
Matt Jankowski
19849eb91d
Skip paperclip spoof detector unless opted into attachment processing specs (#31454) 2024-09-03 15:39:19 +00:00
Matt Jankowski
69dbc23038
Only enable chewy in search-tagged specs (#30583) 2024-09-03 15:38:38 +00:00
Matt Jankowski
7c26e5e4a1
Add Reviewable model concern (#31152) 2024-09-03 15:37:45 +00:00
Matt Jankowski
2f0d0fc127
Add coverage for CLI::Accounts#fix_duplications task (#30639) 2024-09-03 15:36:59 +00:00
Matt Jankowski
e1fa456c7c
Add have_cacheable_headers matcher for responses (#31727) 2024-09-03 15:35:19 +00:00
Matt Jankowski
490bdb7944
Add coverage for StatusesHelper#media_summary method (#31726) 2024-09-03 15:34:09 +00:00
Matt Jankowski
8922786ef4
Fix RSpec/LetSetup cop in api/v1/timelines/tag spec (#30796) 2024-09-03 15:32:12 +00:00
Matt Jankowski
67faaf5557
Simplify account model username presence validation spec (#31013) 2024-09-03 15:30:57 +00:00
Matt Jankowski
fcb83be8b2
Improve coverage specificity for Webhook enable/disable/secret specs (#31194) 2024-09-03 15:30:13 +00:00
Matt Jankowski
928390c2ba
Convert admin/settings controller specs to system specs (#31548) 2024-09-03 15:29:32 +00:00
Matt Jankowski
ef4920c6c9
Pull out https/hostname setup for request specs to shared config (#31622) 2024-09-03 15:28:57 +00:00
Matt Jankowski
79b1841805
Disable without_verify_partial_doubles in statuses/show view spec (#29132) 2024-09-03 15:23:57 +00:00
Matt Jankowski
5b595b8a5a
Remove usage of assigns in controller specs (#30195) 2024-09-03 15:23:16 +00:00
Claire
ea0d691e19
Add GET /api/v2_alpha/notifications/:group_key/accounts (#31725) 2024-09-03 14:32:26 +00:00
Matt Jankowski
219458d7d4
Convert tags controller spec to system and request specs (#31708) 2024-09-03 13:18:53 +00:00
Claire
ac4002fe08 Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream 2024-09-03 12:12:23 +02:00
Matt Jankowski
31c00108a4
Add first pass coverage for AnnualReport class (#31704) 2024-09-03 09:05:26 +00:00
Matt Jankowski
b8957241af
Add coverage for JsonLdHelper#uri_from_bearcap method (#31700) 2024-09-03 08:41:11 +00:00
Matt Jankowski
25bbb01666
Remove unused helper method in spec (#31699) 2024-09-03 08:04:22 +00:00
Matt Jankowski
24a0b20408
Use body_as_json directly instead of via local var assignment (#31696) 2024-09-03 08:03:08 +00:00