Use tilde prefix for nickname only in profile url

openid
Marcin Kulik 11 years ago
parent 4bb61b614f
commit 6acea6da70

@ -79,7 +79,7 @@ class AsciicastDecorator < ApplicationDecorator
if user
user.nickname
elsif model.username
"~#{model.username}"
model.username
else
'anonymous'
end

@ -1,9 +1,5 @@
class UserDecorator < ApplicationDecorator
def nickname
"~#{model.nickname}"
end
def asciicasts_count
model.asciicasts.count
end

@ -8,7 +8,7 @@ class UserMailer < ActionMailer::Base
@asciicast = AsciicastDecorator.new(@comment.asciicast)
user = UserDecorator.new(user)
to = "~#{user.nickname} <#{user.email}>"
to = "#{user.nickname} <#{user.email}>"
subject = %(New comment for #{@asciicast.title})
mail :to => to, :subject => subject
end

@ -179,7 +179,7 @@ describe AsciicastDecorator do
asciicast.username = 'foo'
end
it { should == '~foo' }
it { should == 'foo' }
end
context 'when no user nor username present' do

@ -15,7 +15,7 @@ feature "User session" do
expect(page).to have_content('Logged in!')
within('header') do
expect(page).to have_link('~foobar')
expect(page).to have_link('foobar')
end
end
@ -29,7 +29,7 @@ feature "User session" do
expect(page).to have_content('Logged in!')
within('header') do
expect(page).to have_link('~hasiok')
expect(page).to have_link('hasiok')
end
end

@ -8,7 +8,7 @@ feature "User's profile" do
scenario 'Visiting' do
visit profile_path(user)
expect(page).to have_content(/Asciicasts by ~#{user.nickname}/i)
expect(page).to have_content(/Asciicasts by #{user.nickname}/i)
expect(page).to have_content('1 asciicasts')
expect(page).to have_link('Tricks!')
expect(page).to have_selector('.supplimental .play-button')

Loading…
Cancel
Save