Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 08:19:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
This commit is contained in:
Claire
2025-05-28 18:41:47 +02:00
parent a76647c406 ca41a95872
commit b627aee45f
48 changed files with 588 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spec/helpers/theme_helper_spec.rb
View File

@@ -6,10 +6,10 @@ RSpec.describe ThemeHelper do
describe 'theme_style_tags' do
let(:result) { helper.theme_style_tags(theme) }
context 'when using system theme' do
context 'when using "system" theme' do
let(:theme) { ['glitch', 'system'] }
it 'returns the mastodon-light and default stylesheets with correct color schemes' do
it 'returns the mastodon-light and application stylesheets with correct color schemes' do
expect(html_links.first.attributes.symbolize_keys)
.to include(
href: have_attributes(value: match(/mastodon-light/)),
@@ -23,6 +23,17 @@ RSpec.describe ThemeHelper do
end
end
context 'when using "default" theme' do
let(:theme) { ['glitch', 'default'] }
it 'returns the application stylesheet' do
expect(html_links.last.attributes.symbolize_keys)
.to include(
href: have_attributes(value: match(/application/))
)
end
end
context 'when using other theme' do
let(:theme) { ['glitch', 'contrast'] }