fixed tests, translations, initalizer
This commit is contained in:
parent
23c2eaf1c5
commit
987d334764
5 changed files with 6 additions and 17 deletions
|
|
@ -72,8 +72,6 @@
|
|||
|
||||
#lightbox-backdrop
|
||||
|
||||
|
||||
= current_user.diaspora_handle
|
||||
%ul#user_menu.dropdown
|
||||
%li
|
||||
.right
|
||||
|
|
|
|||
|
|
@ -108,8 +108,9 @@
|
|||
= form_tag(people_path, :method => 'get', :id => "global_search_form") do
|
||||
= text_field_tag 'q', nil, :placeholder => "Search for people", :type => 'search', :results => 5
|
||||
.span-5.last{:style => "height:30px;"}
|
||||
or
|
||||
= link_to t('.find_friends_from_facebook'), friend_finder_path('facebook'), :rel => 'facebox'
|
||||
%h4{:style => "margin-top:7px;"}
|
||||
or
|
||||
= link_to t('.find_friends_from_facebook'), friend_finder_path('facebook'), :rel => 'facebox'
|
||||
.clearfix
|
||||
%br
|
||||
|
||||
|
|
@ -129,7 +130,7 @@
|
|||
= form_tag(people_path, :method => 'get', :id => "global_search_form") do
|
||||
= text_field_tag 'q', nil, :placeholder => "Search for #hashtags", :type => 'search', :results => 5
|
||||
.span-5.last
|
||||
%h4
|
||||
%h4{:style => "margin-top:7px;"}
|
||||
= t('.featured_tags')
|
||||
%p
|
||||
= link_to "#diaspora", tag_path('diaspora')
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#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"
|
||||
AppConfig[:featured_users].each do |x|
|
||||
Webfinger.new(x).fetch
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ end
|
|||
|
||||
Given /^(?:I am signed in|I sign in)$/ do
|
||||
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
|
||||
|
||||
When /^I try to sign in$/ do
|
||||
|
|
|
|||
|
|
@ -81,15 +81,5 @@ describe ContactsController do
|
|||
get :featured
|
||||
assigns[:people].should == [alice.person]
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in a new issue