fixed rspec build

app/controllers/application_controller.rb

@@ -13,7 +13,7 @@ class ApplicationController < ActionController::Base
   before_filter :set_locale
 
   def set_contacts_notifications_and_status
-    if current_user
+    if user_signed_in? 
       @aspect = nil
       @aspects = current_user.aspects.fields(:name)
       @aspects_dropdown_array = @aspects.collect{|x| [x.to_s, x.id]}
@@ -36,13 +36,13 @@ class ApplicationController < ActionController::Base
   end
 
   def set_invites
-    if current_user
+    if user_signed_in?
       @invites = current_user.invites
     end
   end
 
   def set_locale
-    if current_user
+    if user_signed_in?
       I18n.locale = current_user.language
     else
       I18n.locale = request.compatible_language_from AVAILABLE_LANGUAGE_CODES

app/controllers/posts_controller.rb

@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 class PostsController < ApplicationController
-  skip_before_filter :set_contacts_and_status
+  skip_before_filter :set_contacts_notifications_and_status
   skip_before_filter :count_requests
   skip_before_filter :set_invites
   skip_before_filter :set_locale

app/controllers/publics_controller.rb

@@ -6,7 +6,7 @@ class PublicsController < ApplicationController
   require File.join(Rails.root, '/lib/diaspora/parser')
   include Diaspora::Parser
 
-  skip_before_filter :set_contacts_and_status, :except => [:create, :update]
+  skip_before_filter :set_contacts_notifications_and_status, :except => [:create, :update]
   skip_before_filter :count_requests
   skip_before_filter :set_invites
   skip_before_filter :set_locale

lib/diaspora/webhooks.rb

@@ -15,6 +15,5 @@ module Diaspora
     def x(input)
       input.to_s.to_xs
     end
-
   end
 end