Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
Matt Jankowski
db57fe80c8
Remove page_json var from ap/replies spec ( #32000 )
2024-09-26 08:54:01 +00:00
Claire
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
Matt Jankowski
c3b6a7a297
Reduce factory creation (36 -> 12) in spec/controllers/oauth/* area ( #32045 )
2024-09-25 07:56:08 +00:00
Matt Jankowski
06ecf9008b
Remove single-use shared examples in controller specs ( #32044 )
2024-09-25 07:50:15 +00:00
Claire
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
Matt Jankowski
5dfdec6453
Convert settings/applications controller spec to system/request specs ( #32006 )
2024-09-23 13:37:32 +00:00
Matt Jankowski
e0b45b35c9
Combine repeated parsed_body assertions into single ( #32002 )
2024-09-23 08:42:52 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Matt Jankowski
5a8f2fe31d
Convert settings/exports controller spec to system/request specs ( #31965 )
2024-09-19 13:43:40 +00:00
Matt Jankowski
bf8eaaa9a5
Convert controller spec for security_key_options endpoint to request spec ( #31938 )
2024-09-18 09:42:36 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Matt Jankowski
943738671c
Remove unneeded to_s on Link header comparison in statuses controller spec ( #31941 )
2024-09-18 08:21:31 +00:00
Claire
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
Claire
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
Matt Jankowski
207c073bf8
Remove debug output in migration controller spec ( #31886 )
2024-09-12 14:04:46 +00:00
Claire
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
Eugen Rochko
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
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00: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
Emelia Smith
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +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
Claire
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
Matt Jankowski
e820cc30b8
Convert invites controller spec to system/request specs ( #31755 )
2024-09-05 11:54:27 +00: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
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
e1fa456c7c
Add have_cacheable_headers matcher for responses ( #31727 )
2024-09-03 15:35:19 +00:00
Matt Jankowski
928390c2ba
Convert admin/settings controller specs to system specs ( #31548 )
2024-09-03 15:29:32 +00:00
Matt Jankowski
5b595b8a5a
Remove usage of assigns in controller specs ( #30195 )
2024-09-03 15:23:16 +00:00
Matt Jankowski
219458d7d4
Convert tags controller spec to system and request specs ( #31708 )
2024-09-03 13:18:53 +00:00
Claire
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
Matt Jankowski
1ee1c329cc
Convert admin/announcements controller spec to system spec ( #31655 )
2024-08-30 07:15:28 +00:00
Matt Jankowski
02585d8789
Convert media controller spec to request spec ( #31634 )
2024-08-29 08:46:00 +00:00
Matt Jankowski
b9269c8d38
Convert admin/reset controller spec to system spec ( #31643 )
2024-08-29 08:38:17 +00:00
Matt Jankowski
0ef636f72d
Convert shares controller spec to system spec ( #31619 )
2024-08-28 07:58:40 +00:00
Matt Jankowski
00586d27cb
Convert instance_actor controller spec to request spec ( #31621 )
2024-08-28 07:56:07 +00:00
Claire
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
Matt Jankowski
3959f36d19
Add checks about response body content to admin/dash spec ( #30716 )
2024-08-27 14:59:56 +00:00
Matt Jankowski
48f4e5444d
Convert media_proxy controller spec to request spec ( #31600 )
2024-08-27 09:44:16 +00:00
Matt Jankowski
a7f8417795
Convert "CSV export" settings controller specs to request specs ( #31601 )
2024-08-27 08:12:39 +00:00
Matt Jankowski
38a3466741
Convert api/oembed controller spec to request spec ( #31605 )
2024-08-27 07:55:25 +00:00
Matt Jankowski
c09d232ee3
Convert api/web/settings controller spec to request spec ( #31606 )
2024-08-27 07:42:35 +00:00
Claire
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
Matt Jankowski
4c2534d12e
Convert "static page" controller specs to system specs ( #31599 )
2024-08-26 15:53:48 +00:00
Matt Jankowski
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
Matt Jankowski
5172d84946
Convert manifest controller spec to request spec ( #31596 )
2024-08-26 14:37:23 +00:00
Matt Jankowski
36ccdcc9e1
Convert "custom css" controller spec to request spec ( #31595 )
2024-08-26 14:36:31 +00:00
