tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,351 Commits 5 Branches 0 Tags
Commit Graph

1269 Commits

Author SHA1 Message Date
Claire
844ae90dad Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream 2025-01-29 12:05:09 +01:00
Matt Jankowski
2beab34ca4
Convert admin/email_domain_blocks controller -> system spec (#33759) 2025-01-29 10:54:20 +00:00
Claire
353e5f797c Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
 2025-01-28 18:29:46 +01:00
Matt Jankowski
8a2d764d34
Reduce factory creation across controllers/admin specs (#33752) 2025-01-28 08:08:16 +00:00
Claire
fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream 
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
 2025-01-27 18:19:09 +01:00
Matt Jankowski
65d9171c7d
Use expect for admin/ controllers (#33686) 2025-01-27 14:05:16 +00:00
Claire
297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
Matt Jankowski
5be938e661
Migrate visibility interaction checks on statuses to request spec (#33622) 2025-01-17 10:06:52 +00:00
Claire
f6a0cd9d1a Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream 2025-01-16 11:16:53 +01:00
Matt Jankowski
998cf0dd53
Convert auth/setup spec controller->system/request (#33604) 2025-01-16 09:03:46 +00:00
Claire
155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
 2025-01-10 20:41:36 +01:00
Matt Jankowski
a8b0152bc5
Convert admin/terms_of_service/histories spec controller->system (#33534) 2025-01-10 09:11:57 +00:00
Matt Jankowski
8d4ca95163
Convert admin/follow_recommendations spec controller->system (#33533) 2025-01-10 09:10:21 +00:00
Matt Jankowski
f4b463ecb1
Use response.parsed_body for error view application controller spec (#33515) 2025-01-09 08:17:00 +00:00
Matt Jankowski
0c690511c2
Convert auth/challenges spec controller->request (#33495) 2025-01-08 08:54:08 +00:00
Matt Jankowski
b6c2923cf7
Convert settings/migration spec controller->system (#33496) 2025-01-08 08:53:26 +00:00
Claire
126ce9a232 Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream 2025-01-06 20:36:25 +01:00
Matt Jankowski
82d2ce293d
Convert admin/warning_presets spec controller->system (#33474) 2025-01-06 18:24:54 +00:00
Claire
68106f250c Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream 2025-01-03 12:34:47 +01:00
Matt Jankowski
7cbdcd7b3f
Add role-specific user fabricators (#33437) 2025-01-03 08:28:14 +00:00
Claire
cef665788a Merge commit '8e3fd1b8236448f01221b1d7745736e50de51e11' into glitch-soc/merge-upstream 2025-01-02 21:14:14 +01:00
Matt Jankowski
8e3fd1b823
Convert disputes/appeals spec controller->system (#33434) 2025-01-02 16:08:25 +00:00
Matt Jankowski
1fbd106af9
Convert admin/report_notes spec controller->system (#33433) 2025-01-02 15:54:21 +00:00
Matt Jankowski
00a8a5467c
Convert admin/relays spec controller->system (#33430) 2025-01-02 15:01:44 +00:00
Matt Jankowski
2e936785b7
Convert admin/rules spec controller->system (#33377) 2025-01-02 12:57:55 +00:00
Claire
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
Matt Jankowski
8770905186
Convert admin/ip_blocks spec controller->system (#33376) 2024-12-20 15:36:19 +00:00
Matt Jankowski
87c892191a
Convert admin/domain_allows spec controller->system (#33365) 2024-12-20 08:04:22 +00:00
Matt Jankowski
1acc54cfc7
Convert admin/webhooks spec controller->system (#33364) 2024-12-20 07:52:16 +00:00
Matt Jankowski
03bf4cde55
Convert statuses_cleanup controller specs to system specs (#33363) 2024-12-19 13:34:54 +00:00
Matt Jankowski
545a6b9eed
Convert admin/account_moderation_notes spec controller->system (#33354) 2024-12-19 08:02:08 +00:00
Matt Jankowski
668ce14ff2
Convert admin/custom_emojis spec controller->system (#33327) 2024-12-18 08:34:15 +00:00
Matt Jankowski
d65e246192
Convert statuses#activity action controller to request spec (#33336) 2024-12-17 16:37:30 +00:00
Matt Jankowski
60bb51eef8
Convert filters spec controller->system (#33326) 2024-12-17 09:20:01 +00:00
Matt Jankowski
efe4e72f93
Convert settings/preferences/appearance controller spec to system (#33323) 2024-12-16 17:08:19 +00:00
Matt Jankowski
9067a7f696
Convert settings/preferences/notifications controller spec to system (#33322) 2024-12-16 16:24:05 +00:00
Matt Jankowski
bfef66276a
Convert settings/preferences/other controller spec to system (#33321) 2024-12-16 16:23:26 +00:00
Matt Jankowski
c68eb82ffa
Use explicit config loading from bin/rubocop (#33256) 2024-12-16 13:50:58 +00:00
Matt Jankowski
a596f3479b
Convert settings/login_activities controller spec to system spec (#33306) 2024-12-16 08:12:36 +00:00
Matt Jankowski
3d00b95359
Convert settings/profiles controller spec to system spec (#33305) 2024-12-16 08:11:48 +00:00
Matt Jankowski
4130bda12e
Convert settings/verifications controller spec to system spec (#33285) 2024-12-13 10:39:07 +00:00
Matt Jankowski
f721e76d13
Avoid double request in admin/export_domain_allows controller spec (#33255) 2024-12-11 08:58:59 +00:00
Matt Jankowski
39364346bb
Add coverage for admin/terms/drafts#update and admin/terms/generates#create actions (#33251) 2024-12-10 23:09:36 +00:00
Eugen Rochko
30aa0df88c
Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
Claire
4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
Matt Jankowski
9d3fcc3546
Remove unused failure action in api/base controller spec (#32905) 2024-11-15 16:10:20 +00:00
Matt Jankowski
7bd7705f59
Combine shared-setup examples across spec/controllers/auth/* specs (#32906) 2024-11-15 16:07:26 +00:00
Claire
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
Matt Jankowski
df3b954720
Add DomainHelpers spec support module for DNS/MX stub (#32690) 2024-10-29 15:35:25 +00:00
Matt Jankowski
b107fc2e65
Use nil for timestamp column in admin/confirmations spec (#32682) 2024-10-29 08:54:30 +00:00