summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/webfinger/search.xml.erb2
-rw-r--r--test/functional/webfinger_controller_test.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/webfinger/search.xml.erb b/app/views/webfinger/search.xml.erb
index 7328552..16ac137 100644
--- a/app/views/webfinger/search.xml.erb
+++ b/app/views/webfinger/search.xml.erb
@@ -2,6 +2,6 @@
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Subject><%= @presenter.subject %></Subject>
<%- @presenter.links.each do |rel, link| %>
- <Link rel=<%=rel%> type=<%=link[:type]%> href="<%= link[:key] %>"/>
+ <Link rel=<%=rel%> type=<%=link[:type]%> href="<%= link[:href] %>"/>
<% end %>
</XRD>
diff --git a/test/functional/webfinger_controller_test.rb b/test/functional/webfinger_controller_test.rb
index 6597b69..7e1c72a 100644
--- a/test/functional/webfinger_controller_test.rb
+++ b/test/functional/webfinger_controller_test.rb
@@ -15,11 +15,13 @@ class WebfingerControllerTest < ActionController::TestCase
end
test "get user webfinger xml" do
- @user = stub_record :user, :public_key => 'my public key'
+ key = 'my public key'
+ @user = stub_record :user, :public_key => key
User.stubs(:find_by_login).with(@user.login).returns(@user)
get :search, :q => @user.email_address.to_s, :format => :xml
assert_response :success
assert_equal "application/xml", response.content_type
+ assert_includes response.body, Base64.encode64(key)
end
test "get user webfinger json" do