diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index 0a90b024e..65a8a292c 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -2,7 +2,7 @@ = link_to 'albums', albums_path >> = @album.name - %h5= "last updated: #{how_long_ago(@album)}" + %h4= "last updated: #{how_long_ago(@album)}" -unless mine? @album %h4= 'by ' + @album.person.real_name -if mine? @album diff --git a/app/views/people/_sidebar.html.haml b/app/views/people/_sidebar.html.haml index 69836d534..f9a205e1c 100644 --- a/app/views/people/_sidebar.html.haml +++ b/app/views/people/_sidebar.html.haml @@ -12,5 +12,5 @@ - for author in @subscribed_persons %li= link_to author.username, author_path(author) -= link_to "add a new person", new_request_path += link_to "add a new person", requests_path diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml index efb46e644..b688b3c5d 100644 --- a/app/views/people/index.html.haml +++ b/app/views/people/index.html.haml @@ -13,7 +13,7 @@ %td= link_to 'Show', person %td= link_to 'Destroy', person, :confirm => 'Are you sure?', :method => :delete -%p= link_to "Add a friend", new_request_path +%p= link_to "Add a friend", requests_path #pagination = will_paginate @people diff --git a/gpg/diaspora-test/pubring.gpg b/gpg/diaspora-test/pubring.gpg index 413a37f87..7fe081687 100644 Binary files a/gpg/diaspora-test/pubring.gpg and b/gpg/diaspora-test/pubring.gpg differ diff --git a/spec/factories.rb b/spec/factories.rb index d59cfd3fc..b1b61bdcb 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -14,7 +14,7 @@ Factory.define :person do |p| p.email "bob-person@aol.com" p.active true p.sequence(:url) {|n|"http://google-#{n}.com/"} - p.key_fingerprint GPGME::list_keys("Aditi").first.subkeys.first.fingerprint + p.key_fingerprint "fffffffffffffffffooooooooooooooo" p.profile Profile.new( :first_name => "Robert", :last_name => "Grimm" ) end diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb index b01f6f247..337d5b862 100644 --- a/spec/lib/diaspora_parser_spec.rb +++ b/spec/lib/diaspora_parser_spec.rb @@ -1,6 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' include ApplicationHelper +include Diaspora::DiasporaParser describe Diaspora::DiasporaParser do before do