Delete some pending specs, fix a minor bug
This commit is contained in:
parent
1d228fa819
commit
e97081e8cd
3 changed files with 1 additions and 22 deletions
|
|
@ -27,7 +27,7 @@ class StatusMessage < Post
|
||||||
<entry>
|
<entry>
|
||||||
<title>#{x(self.message)}</title>
|
<title>#{x(self.message)}</title>
|
||||||
<link rel="alternate" type="text/html" href="#{person.url}status_messages/#{self.id}"/>
|
<link rel="alternate" type="text/html" href="#{person.url}status_messages/#{self.id}"/>
|
||||||
<id>#{person.url}status_messages/#{self.id}</id>
|
<id>#{person.url}posts/#{self.id}</id>
|
||||||
<published>#{self.created_at.xmlschema}</published>
|
<published>#{self.created_at.xmlschema}</published>
|
||||||
<updated>#{self.updated_at.xmlschema}</updated>
|
<updated>#{self.updated_at.xmlschema}</updated>
|
||||||
<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
|
<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
|
||||||
|
|
|
||||||
|
|
@ -150,15 +150,6 @@ describe Photo do
|
||||||
end
|
end
|
||||||
|
|
||||||
context "commenting" do
|
context "commenting" do
|
||||||
|
|
||||||
it "forwards comments to parent status message" do
|
|
||||||
pending 'IMPORTANT! comments need to get sent to parent status message for a photo if one is present. do this from the photo model, NOT in comment.'
|
|
||||||
status_message = @user.build_post(:status_message, :message => "whattup", :to => @aspect.id)
|
|
||||||
status_message.photos << @photo2
|
|
||||||
status_message.save
|
|
||||||
proc{ @user.comment("big willy style", :on => @photo2) }.should change(status_message.comments, :count).by(1)
|
|
||||||
end
|
|
||||||
|
|
||||||
it "accepts comments if there is no parent status message" do
|
it "accepts comments if there is no parent status message" do
|
||||||
proc{ @user.comment("big willy style", :on => @photo) }.should change(@photo.comments, :count).by(1)
|
proc{ @user.comment("big willy style", :on => @photo) }.should change(@photo.comments, :count).by(1)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -26,16 +26,4 @@ describe Services::Facebook do
|
||||||
@service.post(@post, url)
|
@service.post(@post, url)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
describe '.public_message' do
|
|
||||||
it 'calls super with MAX_CHARACTERS' do
|
|
||||||
pending "i guess you cant test this?"
|
|
||||||
message = mock()
|
|
||||||
message.should_receive(:message).and_return("foo")
|
|
||||||
service = Services::Facebook.new
|
|
||||||
service.should_receive(:super).with(message, Services::Facebook::MAX_CHARACTERS, "url")
|
|
||||||
service.public_message(message, "url")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue