Skip to content

Commit

Permalink
Merge staging into master
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Jan 5, 2024
2 parents bc33ba2 + d3b686f commit 23c75f1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/models/role.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Role < ApplicationRecord

def name
if treasurer?
Rails.application.config.x.treasurer_title
Rails.application.config.x.treasurer_title.capitalize
elsif main_bartender?
'Hoofdtapper'
end
Expand Down
2 changes: 1 addition & 1 deletion spec/models/role_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
context 'when treasurer' do
subject(:role) { build_stubbed(:role, role_type: :treasurer) }

it { expect(role.name).to eq Rails.application.config.x.treasurer_title }
it { expect(role.name).to eq Rails.application.config.x.treasurer_title.capitalize }
end

context 'when main bartender' do
Expand Down

0 comments on commit 23c75f1

Please sign in to comment.