From 66f66b85a6f04d635a1d9bf399265730c88608f7 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <mbs348@gmail.com>
Date: Sat, 24 Jul 2010 23:21:02 -0700
Subject: [PATCH] MS added test, things still seem broken though

---
 app/controllers/publics_controller.rb       |  4 ++--
 app/helpers/application_helper.rb           |  2 --
 spec/controllers/publics_controller_spec.rb | 12 ++++++++++++
 spec/factories.rb                           |  1 +
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 024a7df40..2ba346fc9 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -1,6 +1,6 @@
 class PublicsController < ApplicationController
-  include ApplicationHelper
-  include PublicsHelper
+  require 'lib/diaspora/diaspora_parser'
+  include Diaspora::DiasporaParser
   include Diaspora::OStatusParser
   
   def hcard
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index aa0ab515f..8024717d8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,4 @@
 module ApplicationHelper
-  require 'lib/diaspora/diaspora_parser'
-  include Diaspora::DiasporaParser
   def object_path(object)
     eval("#{object.class.to_s.underscore}_path(object)")
   end
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index be297a64f..bffb0d8b3 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -8,6 +8,18 @@ describe PublicsController do
     request.env['warden'] = mock_model(Warden, :authenticate? => @user, :authenticate! => @user, :authenticate => @user)
   end
 
+  describe 'receive endpoint' do
+
+    it 'should accept a post from anohter node and save the information' do
+      
+      person = Factory.create(:person)
+      message = StatusMessage.new(:message => 'foo', :person => person)
+      StatusMessage.all.count.should == 0
+      post :receive, {:xml => Post.build_xml_for(message)}
+      StatusMessage.all.count.should == 1
+    end
+  end
+
   describe 'PubSubHubBuB intergration' do 
 
     describe 'incoming subscriptions' do
diff --git a/spec/factories.rb b/spec/factories.rb
index 4ab541c54..d59cfd3fc 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -28,6 +28,7 @@ Factory.define :user do |u|
 end
 Factory.define :status_message do |m|
   m.sequence(:message) {|n| "jimmy's #{n} whales"}
+  m.person
 end
 
 Factory.define :blog do |b|