Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vincent Grippi <Dan@SPEEDRACER.local>2010-09-14 03:05:43 +0400
committerDaniel Vincent Grippi <Dan@SPEEDRACER.local>2010-09-14 03:05:43 +0400
commit84b29770fef07ddcf1b337eb5bb6bbb6e0217082 (patch)
tree19cf0989851c935c60d51b7be9e549bccf58af75
parent26e4e088d79bcfffa2f56c10a182a28e8d821aeb (diff)
Put raise back in webfinger fail
-rw-r--r--app/models/person.rb2
-rw-r--r--spec/lib/salmon_salmon_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/person.rb b/app/models/person.rb
index f7d2cc556..b85b98264 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -102,7 +102,7 @@ class Person
rescue SocketError => e
raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/
end
- #raise "No diaspora user found at #{identifier}"
+ raise "No diaspora user found at #{identifier}" unless f
Person.from_webfinger_profile(identifier, f )
end
end
diff --git a/spec/lib/salmon_salmon_spec.rb b/spec/lib/salmon_salmon_spec.rb
index 7077b7727..f372a5e12 100644
--- a/spec/lib/salmon_salmon_spec.rb
+++ b/spec/lib/salmon_salmon_spec.rb
@@ -63,7 +63,7 @@ describe Salmon do
it 'should fail to reference a nonexistent remote author' do
@parsed_salmon.author_email = 'idsfug@difgubhpsduh.rgd'
- proc {@parsed_salmon.author.real_name}.should raise_error /not found/
+ proc {@parsed_salmon.author.real_name}.should raise_error /No diaspora user found/
end
end