MS DG down to four failures

app/helpers/application_helper.rb

@@ -3,8 +3,6 @@
 #   the COPYRIGHT file.
 
 module ApplicationHelper
-  include Rails.application.routes.url_helpers
-
   def how_long_ago(obj)
     timeago(obj.created_at)
   end

app/helpers/notifications_helper.rb

@@ -1,7 +1,5 @@
 module NotificationsHelper
   include PeopleHelper
-  include Rails.application.routes.url_helpers
-
 
   def object_link(note, actors)
     target_type = note.popup_translation_key

app/helpers/people_helper.rb

@@ -4,7 +4,6 @@
 
 module PeopleHelper
   include ERB::Util
-  include Rails.application.routes.url_helpers
 
   def search_header
     if search_query.blank?

config/environments/test.rb

@@ -29,7 +29,9 @@ Diaspora::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
   config.active_support.deprecation = :stderr
-  config.threadsafe!
+
+  # fixes url helper issue in rspec
+  #config.threadsafe!
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,

spec/controllers/posts_controller_spec.rb

@@ -94,7 +94,7 @@ describe PostsController do
         end
 
         it 'assumes guids less than 8 chars are ids and not guids' do
-          Post.should_receive(:where).with(hash_including(:id => @status.id)).and_return(Post)
+          Post.should_receive(:where).with(hash_including(:id => @status.id.to_s)).and_return(Post)
           get :show, :id => @status.id
           response.should be_success
         end

spec/helpers/application_helper_spec.rb

@@ -5,8 +5,6 @@
 require 'spec_helper'
 
 describe ApplicationHelper do
-  include Rails.application.routes.url_helpers
-
   before do
     @user = alice
     @person = Factory(:person)

spec/helpers/notifications_helper_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 
 describe NotificationsHelper do
   include ApplicationHelper
-  include Rails.application.routes.url_helpers
 
   before do
     @user = Factory(:user)

spec/helpers/people_helper_spec.rb

@@ -5,12 +5,11 @@
 require 'spec_helper'
 
 describe PeopleHelper do
-  include Rails.application.routes.url_helpers
-
  before do
     @user = alice
     @person = Factory(:person)
   end
+
  describe "#person_image_link" do
     it "returns an empty string if person is nil" do
       person_image_link(nil).should == ""

spec/helpers/tags_helper_spec.rb

@@ -6,10 +6,12 @@ describe TagsHelper do
       helper.stub(:search_query).and_return('foo@bar.com')
       helper.looking_for_tag_link.should be_nil
     end
+
     it 'returns nil if it normalizes to blank' do
       helper.stub(:search_query).and_return('++')
       helper.looking_for_tag_link.should be_nil
     end
+
     it 'returns a link to the tag otherwise' do
       helper.stub(:search_query).and_return('foo')
       helper.looking_for_tag_link.should include(helper.tag_link)