From e97081e8cd836f65b395d18a33a5de5b247f30f8 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Wed, 19 Jan 2011 17:11:18 -0800
Subject: [PATCH] Delete some pending specs, fix a minor bug
---
app/models/status_message.rb | 2 +-
spec/models/photo_spec.rb | 9 ---------
spec/models/services/facebook_spec.rb | 12 ------------
3 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 56475a63d1..1887122bd0 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -27,7 +27,7 @@ class StatusMessage < Post
<entry>
<title>#{x(self.message)}</title>
<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>
<updated>#{self.updated_at.xmlschema}</updated>
<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index 4c9041ff20..9eeea72eaa 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -150,15 +150,6 @@ describe Photo do
end
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
proc{ @user.comment("big willy style", :on => @photo) }.should change(@photo.comments, :count).by(1)
end
diff --git a/spec/models/services/facebook_spec.rb b/spec/models/services/facebook_spec.rb
index dd911cd10c..926a7b32b2 100644
--- a/spec/models/services/facebook_spec.rb
+++ b/spec/models/services/facebook_spec.rb
@@ -26,16 +26,4 @@ describe Services::Facebook do
@service.post(@post, url)
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
--
GitLab