2e936785b7
Convert `admin/rules` spec controller->system ( #33377 )
2025-01-02 12:57:55 +00:00
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
8770905186
Convert `admin/ip_blocks` spec controller->system ( #33376 )
2024-12-20 15:36:19 +00:00
87c892191a
Convert `admin/domain_allows` spec controller->system ( #33365 )
2024-12-20 08:04:22 +00:00
1acc54cfc7
Convert `admin/webhooks` spec controller->system ( #33364 )
2024-12-20 07:52:16 +00:00
03bf4cde55
Convert `statuses_cleanup` controller specs to system specs ( #33363 )
2024-12-19 13:34:54 +00:00
545a6b9eed
Convert `admin/account_moderation_notes` spec controller->system ( #33354 )
2024-12-19 08:02:08 +00:00
668ce14ff2
Convert `admin/custom_emojis` spec controller->system ( #33327 )
2024-12-18 08:34:15 +00:00
d65e246192
Convert `statuses#activity` action controller to request spec ( #33336 )
2024-12-17 16:37:30 +00:00
60bb51eef8
Convert `filters` spec controller->system ( #33326 )
2024-12-17 09:20:01 +00:00
efe4e72f93
Convert `settings/preferences/appearance` controller spec to system ( #33323 )
2024-12-16 17:08:19 +00:00
9067a7f696
Convert `settings/preferences/notifications` controller spec to system ( #33322 )
2024-12-16 16:24:05 +00:00
bfef66276a
Convert `settings/preferences/other` controller spec to system ( #33321 )
2024-12-16 16:23:26 +00:00
c68eb82ffa
Use explicit config loading from `bin/rubocop` ( #33256 )
2024-12-16 13:50:58 +00:00
a596f3479b
Convert `settings/login_activities` controller spec to system spec ( #33306 )
2024-12-16 08:12:36 +00:00
3d00b95359
Convert `settings/profiles` controller spec to system spec ( #33305 )
2024-12-16 08:11:48 +00:00
4130bda12e
Convert `settings/verifications` controller spec to system spec ( #33285 )
2024-12-13 10:39:07 +00:00
f721e76d13
Avoid double request in `admin/export_domain_allows` controller spec ( #33255 )
2024-12-11 08:58:59 +00:00
39364346bb
Add coverage for admin/terms/drafts#update and admin/terms/generates#create actions ( #33251 )
2024-12-10 23:09:36 +00:00
30aa0df88c
Add terms of service ( #33055 )
2024-12-09 10:04:46 +00:00
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
9d3fcc3546
Remove unused failure action in api/base controller spec ( #32905 )
2024-11-15 16:10:20 +00:00
7bd7705f59
Combine shared-setup examples across `spec/controllers/auth/*` specs ( #32906 )
2024-11-15 16:07:26 +00:00
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
df3b954720
Add `DomainHelpers` spec support module for DNS/MX stub ( #32690 )
2024-10-29 15:35:25 +00:00
b107fc2e65
Use nil for timestamp column in admin/confirmations spec ( #32682 )
2024-10-29 08:54:30 +00:00
6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while glitch-soc
has a different version of the file overall.
Added upstream's changes.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
c40cd79c4d
Convert `admin/invites` controller specs to system specs ( #32450 )
2024-10-15 14:27:46 +00:00
28131b4b00
Convert status embed controller to request spec ( #32448 )
2024-10-15 14:18:20 +00:00
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
06d6b35e88
Convert `admin/tags` controller specs to system specs ( #32447 )
2024-10-14 08:31:12 +00:00
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
d270d6dd4f
Provide `use_path` to qr generator for svg data size reduction ( #32127 )
2024-10-02 13:26:46 +00:00
e6cda8388c
Move OTP secret length to configuration ( #32125 )
2024-10-01 09:38:42 +00:00
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
db57fe80c8
Remove `page_json` var from ap/replies spec ( #32000 )
2024-09-26 08:54:01 +00:00
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
c3b6a7a297
Reduce factory creation (36 -> 12) in `spec/controllers/oauth/*` area ( #32045 )
2024-09-25 07:56:08 +00:00
06ecf9008b
Remove single-use shared examples in controller specs ( #32044 )
2024-09-25 07:50:15 +00:00
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
5dfdec6453
Convert `settings/applications` controller spec to system/request specs ( #32006 )
2024-09-23 13:37:32 +00:00
e0b45b35c9
Combine repeated parsed_body assertions into single ( #32002 )
2024-09-23 08:42:52 +00:00
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
5a8f2fe31d
Convert `settings/exports` controller spec to system/request specs ( #31965 )
2024-09-19 13:43:40 +00:00
bf8eaaa9a5
Convert controller spec for security_key_options endpoint to request spec ( #31938 )
2024-09-18 09:42:36 +00:00
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
943738671c
Remove unneeded `to_s` on `Link` header comparison in statuses controller spec ( #31941 )
2024-09-18 08:21:31 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
207c073bf8
Remove debug output in migration controller spec ( #31886 )
2024-09-12 14:04:46 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
3d46f47817
Change embedded posts to use web UI ( #31766 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
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
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +00:00
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
7efe0bde9d
Add `have_http_link_header` matcher and set header values as strings ( #31010 )
2024-09-05 20:05:38 +00:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
e820cc30b8
Convert invites controller spec to system/request specs ( #31755 )
2024-09-05 11:54:27 +00:00
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
e1b5f3fc6f
Use `response.parsed_body` for html response checks ( #31750 )
2024-09-04 17:29:05 +00:00
f1003b2560
Enable "zero monkey patching" mode in RSpec ( #31614 )
2024-09-04 05:12:25 +00:00
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
e1fa456c7c
Add `have_cacheable_headers` matcher for responses ( #31727 )
2024-09-03 15:35:19 +00:00
928390c2ba
Convert `admin/settings` controller specs to system specs ( #31548 )
2024-09-03 15:29:32 +00:00
5b595b8a5a
Remove usage of `assigns` in controller specs ( #30195 )
2024-09-03 15:23:16 +00:00
219458d7d4
Convert `tags` controller spec to system and request specs ( #31708 )
2024-09-03 13:18:53 +00:00
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
1ee1c329cc
Convert `admin/announcements` controller spec to system spec ( #31655 )
2024-08-30 07:15:28 +00:00
02585d8789
Convert `media` controller spec to request spec ( #31634 )
2024-08-29 08:46:00 +00:00
b9269c8d38
Convert `admin/reset` controller spec to system spec ( #31643 )
2024-08-29 08:38:17 +00:00
0ef636f72d
Convert `shares` controller spec to system spec ( #31619 )
2024-08-28 07:58:40 +00:00
00586d27cb
Convert `instance_actor` controller spec to request spec ( #31621 )
2024-08-28 07:56:07 +00:00
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
3959f36d19
Add checks about response body content to admin/dash spec ( #30716 )
2024-08-27 14:59:56 +00:00
48f4e5444d
Convert `media_proxy` controller spec to request spec ( #31600 )
2024-08-27 09:44:16 +00:00
a7f8417795
Convert "CSV export" settings controller specs to request specs ( #31601 )
2024-08-27 08:12:39 +00:00
38a3466741
Convert `api/oembed` controller spec to request spec ( #31605 )
2024-08-27 07:55:25 +00:00
c09d232ee3
Convert `api/web/settings` controller spec to request spec ( #31606 )
2024-08-27 07:42:35 +00:00
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
4c2534d12e
Convert "static page" controller specs to system specs ( #31599 )
2024-08-26 15:53:48 +00:00
dbe0ee8a81
Convert `emojis` controller spec to request spec ( #31597 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-08-26 15:00:05 +00:00
5172d84946
Convert `manifest` controller spec to request spec ( #31596 )
2024-08-26 14:37:23 +00:00
36ccdcc9e1
Convert "custom css" controller spec to request spec ( #31595 )
2024-08-26 14:36:31 +00:00
641ae6a2cf
Convert health check endpoint controller spec to request spec ( #31565 )
2024-08-26 12:17:35 +00:00
654187a995
Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream
2024-07-29 19:16:58 +02:00
c40e481169
Implement UI for Admin Search of Hashtags ( #30880 )
2024-07-29 15:49:44 +00:00
fb411b6d0f
Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream
2024-07-27 13:19:38 +02:00
dd53792714
Move UI tests from controller to system spec ( #31158 )
2024-07-26 14:53:49 +00:00
693d9b03ed
Enable OAuth PKCE Extension ( #31129 )
2024-07-26 08:53:10 +00:00
68000956f4
Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream
2024-07-23 19:31:23 +02:00
bb2e5a4b58
Add audit logs to Admin::InstancesController ( #27386 )
2024-07-23 08:12:30 +00:00
c75fe09e2b
Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream
2024-07-18 17:56:25 +02:00
2616fde9e6
Use change-requiring records in admin/reports controller spec ( #31052 )
2024-07-18 07:49:44 +00:00
5e7720d11b
Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream
2024-07-17 22:20:12 +02:00
76c2c5c748
Reduce extra round trips in `activitypub` controller specs ( #31041 )
2024-07-17 08:09:34 +00:00
55cf5e0188
Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream
2024-07-12 13:41:54 +02:00
73d53827ea
Add change assertion to invites destroy spec ( #31004 )
2024-07-12 08:19:15 +00:00
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
f1300ad284
Rename jobs/attachments rspec tag names ( #29762 )
2024-07-08 16:01:08 +00:00
Matt Jankowski
Claire
Eugen Rochko
David Roetzel
Emelia Smith