nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed tests, translations, initalizer

Browse source
This commit is contained in:
danielgrippi 2011-08-03 16:55:04 -07:00
parent 23c2eaf1c5
commit 987d334764
5 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/_header.html.haml
View file

@ -72,8 +72,6 @@
#lightbox-backdrop #lightbox-backdrop
= current_user.diaspora_handle
%ul#user_menu.dropdown %ul#user_menu.dropdown
%li %li
.right .right

3
app/views/users/getting_started.html.haml
View file

@ -108,6 +108,7 @@
= form_tag(people_path, :method => 'get', :id => "global_search_form") do = form_tag(people_path, :method => 'get', :id => "global_search_form") do
= text_field_tag 'q', nil, :placeholder => "Search for people", :type => 'search', :results => 5 = text_field_tag 'q', nil, :placeholder => "Search for people", :type => 'search', :results => 5
.span-5.last{:style => "height:30px;"} .span-5.last{:style => "height:30px;"}
%h4{:style => "margin-top:7px;"}
or or
= link_to t('.find_friends_from_facebook'), friend_finder_path('facebook'), :rel => 'facebox' = link_to t('.find_friends_from_facebook'), friend_finder_path('facebook'), :rel => 'facebox'
.clearfix .clearfix
@ -129,7 +130,7 @@
= form_tag(people_path, :method => 'get', :id => "global_search_form") do = form_tag(people_path, :method => 'get', :id => "global_search_form") do
= text_field_tag 'q', nil, :placeholder => "Search for #hashtags", :type => 'search', :results => 5 = text_field_tag 'q', nil, :placeholder => "Search for #hashtags", :type => 'search', :results => 5
.span-5.last .span-5.last
%h4 %h4{:style => "margin-top:7px;"}
= t('.featured_tags') = t('.featured_tags')
%p %p
= link_to "#diaspora", tag_path('diaspora') = link_to "#diaspora", tag_path('diaspora')

2
config/initializers/fetch_featured_users.rb
View file

@ -1,6 +1,6 @@
#this breaks seed scripts #this breaks seed scripts
unless Rails.env == 'test' || AppConfig[:featured_users].count == Person.featured_users.count unless !ActiveRecord::Base.connection.table_exists?('people') || Rails.env == 'test' || AppConfig[:featured_users].count == Person.featured_users.count
print "Fetching featured users from remote servers" print "Fetching featured users from remote servers"
AppConfig[:featured_users].each do |x| AppConfig[:featured_users].each do |x|
Webfinger.new(x).fetch Webfinger.new(x).fetch

2
features/step_definitions/session_steps.rb
View file

@ -11,7 +11,7 @@ end
Given /^(?:I am signed in|I sign in)$/ do Given /^(?:I am signed in|I sign in)$/ do
When %(I try to sign in) When %(I try to sign in)
wait_until { page.has_content?(@me.diaspora_handle) } wait_until { page.has_content?("#{@me.first_name} #{@me.last_name}") }
end end
When /^I try to sign in$/ do When /^I try to sign in$/ do

10
spec/controllers/contacts_controller_spec.rb
View file

@ -81,15 +81,5 @@ describe ContactsController do
get :featured get :featured
assigns[:people].should == [alice.person] assigns[:people].should == [alice.person]
end end
it 'fetches the webfinger profiles' do
AppConfig[:featured_users] = [alice.diaspora_handle]
wf = mock
wf.should_receive(:fetch)
Webfinger.should_receive(:new).with(alice.diaspora_handle).and_return(wf)
get :featured
end
end end
end end