remove status_message#public_message: we never use it
This commit is contained in:
parent
f9279f9bbc
commit
9d480b0961
3 changed files with 0 additions and 29 deletions
|
|
@ -17,7 +17,6 @@ class StatusMessagesController < ApplicationController
|
||||||
public_flag = params[:status_message][:public]
|
public_flag = params[:status_message][:public]
|
||||||
public_flag.to_s.match(/(true)|(on)/) ? public_flag = true : public_flag = false
|
public_flag.to_s.match(/(true)|(on)/) ? public_flag = true : public_flag = false
|
||||||
params[:status_message][:public] = public_flag
|
params[:status_message][:public] = public_flag
|
||||||
puts public_flag
|
|
||||||
|
|
||||||
@status_message = current_user.build_post(:status_message, params[:status_message])
|
@status_message = current_user.build_post(:status_message, params[:status_message])
|
||||||
aspects = current_user.aspects_from_ids(params[:aspect_ids])
|
aspects = current_user.aspects_from_ids(params[:aspect_ids])
|
||||||
|
|
|
||||||
|
|
@ -98,13 +98,6 @@ class StatusMessage < Post
|
||||||
XML
|
XML
|
||||||
end
|
end
|
||||||
|
|
||||||
def public_message(length, url = "")
|
|
||||||
space_for_url = url.blank? ? 0 : (url.length + 1)
|
|
||||||
truncated = truncate(self.message, :length => (length - space_for_url))
|
|
||||||
truncated = "#{truncated} #{url}" unless url.blank?
|
|
||||||
return truncated
|
|
||||||
end
|
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def message_or_photos_present?
|
def message_or_photos_present?
|
||||||
|
|
|
||||||
|
|
@ -225,25 +225,4 @@ STR
|
||||||
Post.find(post.id).youtube_titles.should == {video_id => CGI::escape(expected_title)}
|
Post.find(post.id).youtube_titles.should == {video_id => CGI::escape(expected_title)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#public_message' do
|
|
||||||
before do
|
|
||||||
message = ""
|
|
||||||
440.times{message << 'd'}
|
|
||||||
@status_message = @user.post(:status_message, :message => message, :to => @aspect.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'truncates the message' do
|
|
||||||
@status_message.public_message(140).length.should == 140
|
|
||||||
@status_message.public_message(420).length.should == 420
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'has the correct length if a url is present' do
|
|
||||||
@status_message.public_message(140, "a_url_goes_here").length.should == 140
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'adds the public link if present' do
|
|
||||||
@status_message.public_message(140, "/p/#{@status_message.id}").should include "/p/#{@status_message.id}"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue