b330cc21c4
Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream
2025-03-12 19:48:51 +01:00
f71a855e2d
Add coverage for `standard` params on push subs create ( #34092 )
2025-03-12 14:29:19 +00:00
399fbf97de
Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream
2025-03-11 18:44:32 +01:00
325b55485e
Convert `admin/settings/branding` spec controller->request ( #34130 )
2025-03-11 13:32:39 +00:00
fb55d09f77
Merge commit 'fb34d9c5909116d586a0187d86ada36ee1234f61' into glitch-soc/merge-upstream
2025-03-10 19:48:45 +01:00
e1f278cdf2
Convert `admin/webhooks/secrets` spec controller->system ( #34109 )
2025-03-10 08:17:48 +00:00
7169b270ae
Convert `admin/site_uploads` spec controller->system ( #34108 )
2025-03-10 08:17:02 +00:00
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
9d5a9123b9
Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream
2025-03-07 13:15:10 +01:00
b6f3cfb302
Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream
2025-03-06 20:10:00 +01:00
b021cfc91e
Convert `settings/sessions` spec controller->system ( #34072 )
2025-03-06 08:21:05 +00:00
ce23342d72
Convert `admin/terms_of_service/*` spec controller->system ( #33975 )
2025-03-04 15:27:44 +00:00
b56e90d049
Convert `admin/relationships` spec controller->system ( #34002 )
2025-02-28 11:17:13 +00:00
3aaa388ce4
Convert `admin/trends/*` spec controller->system ( #34003 )
2025-02-28 10:55:37 +00:00
a682bd19f5
Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream
2025-02-25 18:52:24 +01:00
298ca53593
Add choice of law to terms of service generator ( #33994 )
2025-02-25 10:58:11 +00:00
524e8992ad
Merge commit 'db971976853103017b1561f2c4f9406fa00c0a2e' into glitch-soc/merge-upstream
2025-02-22 21:31:46 +01:00
db97197685
Remove `rails-controller-testing` gem ( #33955 )
2025-02-21 14:00:16 +00:00
2a15bf4ede
Convert `admin/roles` controller spec to request/sytem specs ( #33947 )
2025-02-21 11:47:47 +00:00
d065d02d88
Improve example wording in 2FA/confirmations controller spec ( #33944 )
2025-02-21 07:31:06 +00:00
f3bc50778b
Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream
2025-02-18 20:38:57 +01:00
fbea3a64cc
Convert `statuses` spec controller->system/request ( #33921 )
2025-02-18 11:43:49 +00:00
ea53faeb3f
Convert `admin/users/roles` spec controller->system/request ( #33930 )
2025-02-17 09:25:25 +00:00
8f1b41622b
Convert `settings/two_factor_authentication_methods` spec controller->system/request ( #33914 )
2025-02-13 10:50:04 +00:00
62dc303d3c
Convert `settings/two_factor_authentication/recovery_codes` spec controller->system/request ( #33912 )
2025-02-13 08:02:01 +00:00
28d85ede4c
Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream
2025-02-12 18:40:21 +01:00
fb0856458b
Verify page content in `ChallengableConcern` spec ( #33895 )
2025-02-12 14:24:17 +00:00
6df24b4bc2
Move signed out statuses controller spec examples to request spec ( #33907 )
2025-02-12 14:24:03 +00:00
b07cd11f4c
Convert `settings/migration/redirects` spec controller->system ( #33905 )
2025-02-12 14:06:35 +00:00
506a70d0d8
Convert "http signatures" portion of statuses controller spec to request spec ( #33890 )
2025-02-12 08:33:25 +00:00
aa10e8f399
Verify page content in 2FA portion of `auth/sessions` controller spec ( #33891 )
2025-02-12 08:14:35 +00:00
4c597d5e2c
Convert `settings/privacy` spec controller->system ( #33894 )
2025-02-12 08:13:01 +00:00
4e58570f73
Use common `before` and contexts in admin/base controller spec ( #33879 )
2025-02-11 06:49:51 +00:00
7d20c12913
Convert `settings/featured_tags` controller->request/system spec ( #33880 )
2025-02-11 06:45:34 +00:00
8c240ef042
Remove final remaining `assigns` usage in controller specs ( #33866 )
2025-02-10 07:33:36 +00:00
a417d6f3fc
Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/precompute_feed_service.rb`:
Upstream added an option to skip half-generated timelines.
We have a conflict because we still maintain upstream's old chronological DM
timelines.
Update our code to apply the same logic to the DM timelines.
2025-02-07 21:21:28 +01:00
23a0d91126
Combine examples to reduce factories in specs ( #33841 )
2025-02-06 10:54:31 +00:00
c85616ee3a
Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
Added upstream's code.
- `app/models/user_settings.rb`:
Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
setting added upstream.
Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
Same.
- `app/services/precompute_feed_service.rb`:
Not a real conflict, glitch-soc has extra code for the direct feed.
Added upstream's new code for populating lists.
2025-02-01 19:07:13 +01:00
77587913ce
Convert `admin/reports` spec controller->system ( #33789 )
2025-01-31 08:15:51 +00:00
c5cd9bda48
Convert `auth/passwords` spec controller->system/request ( #33790 )
2025-01-31 08:08:56 +00:00
844ae90dad
Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream
2025-01-29 12:05:09 +01:00
2beab34ca4
Convert `admin/email_domain_blocks` controller -> system spec ( #33759 )
2025-01-29 10:54:20 +00:00
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
8a2d764d34
Reduce factory creation across `controllers/admin` specs ( #33752 )
2025-01-28 08:08:16 +00:00
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
65d9171c7d
Use `expect` for `admin/` controllers ( #33686 )
2025-01-27 14:05:16 +00:00
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
5be938e661
Migrate visibility interaction checks on statuses to request spec ( #33622 )
2025-01-17 10:06:52 +00:00
f6a0cd9d1a
Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream
2025-01-16 11:16:53 +01:00
998cf0dd53
Convert `auth/setup` spec controller->system/request ( #33604 )
2025-01-16 09:03:46 +00:00
Claire
Matt Jankowski
Eugen Rochko