Skip to content
This repository was archived by the owner on Jun 27, 2023. It is now read-only.

Commit c5f8a32

Browse files
committed
formatting address on user profile page
1 parent e57bc9c commit c5f8a32

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

app/models/postal_address.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ class PostalAddress < ApplicationRecord
33
validates_presence_of :address_line_1, :city, :postal_code, :country
44

55
def formatted
6-
"#{address_line_1.split.map(&:capitalize).join(' ')} #{address_line_2} #{city}, #{state_or_province} #{postal_code} #{country}"
6+
"#{capitalize(address_line_1)} #{capitalize(address_line_2)} #{capitalize(city)}, #{state_or_province} #{postal_code} #{self.country}"
7+
end
8+
9+
private
10+
11+
def capitalize(string)
12+
string.split.map(&:capitalize).join(' ')
713
end
814
end

spec/factories/postal_address.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
city { FFaker::AddressUS.city}
77
state_or_province { FFaker::AddressUS.state}
88
postal_code { FFaker::AddressUS.zip_code}
9-
country "Barbados"
9+
country { FFaker::Address.country }
1010
end
1111
end

spec/features/users/postal_address_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
expect(page).to have_content address.city
2727
expect(page).to have_content address.state_or_province
2828
expect(page).to have_content address.postal_code
29-
# expect(page).to have_content address.country
29+
expect(page).to have_content user.postal_address.country
3030
end
3131

3232
it 'does not allow a postal address to be added if required fields are missing' do

0 commit comments

Comments
 (0)