From 987d334764d09cb5698dd88756f577c6c0214af8 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Wed, 3 Aug 2011 16:55:04 -0700
Subject: [PATCH] fixed tests, translations, initalizer

---
 app/views/layouts/_header.html.haml          |  2 --
 app/views/users/getting_started.html.haml    |  7 ++++---
 config/initializers/fetch_featured_users.rb  |  2 +-
 features/step_definitions/session_steps.rb   |  2 +-
 spec/controllers/contacts_controller_spec.rb | 10 ----------
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index b5c719a9f..9a181d969 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -72,8 +72,6 @@
 
       #lightbox-backdrop
         
-
-    = current_user.diaspora_handle
     %ul#user_menu.dropdown
       %li
         .right
diff --git a/app/views/users/getting_started.html.haml b/app/views/users/getting_started.html.haml
index 542190630..4caee399e 100644
--- a/app/views/users/getting_started.html.haml
+++ b/app/views/users/getting_started.html.haml
@@ -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')
diff --git a/config/initializers/fetch_featured_users.rb b/config/initializers/fetch_featured_users.rb
index cf03ca3ad..82d903a91 100644
--- a/config/initializers/fetch_featured_users.rb
+++ b/config/initializers/fetch_featured_users.rb
@@ -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
diff --git a/features/step_definitions/session_steps.rb b/features/step_definitions/session_steps.rb
index 043d53130..787315dae 100644
--- a/features/step_definitions/session_steps.rb
+++ b/features/step_definitions/session_steps.rb
@@ -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
diff --git a/spec/controllers/contacts_controller_spec.rb b/spec/controllers/contacts_controller_spec.rb
index ccef9d82a..dfdff97a2 100644
--- a/spec/controllers/contacts_controller_spec.rb
+++ b/spec/controllers/contacts_controller_spec.rb
@@ -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