mirror of
https://github.com/diaspora/diaspora.git
synced 2026-04-29 03:01:03 -04:00
just kidding. needed that test config, but pulled out some deprecated curl stuff hanging around statusmessages and checked tests accordingly
This commit is contained in:
@@ -39,7 +39,7 @@ class StatusMessagesController < ApplicationController
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.xml { render :xml => @status_message }
|
||||
format.xml { render :xml => Post.build_xml_for(@status_message) }
|
||||
format.json { render :json => @status_message }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
class StatusMessage < Post
|
||||
include StatusMessagesHelper
|
||||
require 'lib/net/curl'
|
||||
|
||||
xml_name :status_message
|
||||
|
||||
@@ -19,9 +18,6 @@ class StatusMessage < Post
|
||||
StatusMessage.newest(User.first.email)
|
||||
end
|
||||
|
||||
def self.retrieve_from_friend(friend)
|
||||
StatusMessages.from_xml Curl.get(friend.url+"status_messages.xml")
|
||||
end
|
||||
|
||||
def ==(other)
|
||||
(self.message == other.message) && (self.owner == other.owner)
|
||||
|
||||
@@ -29,5 +29,14 @@ Diaspora::Application.configure do
|
||||
# This is necessary if your schema can't be completely dumped by the schema dumper,
|
||||
# like if you have constraints or database-specific column types
|
||||
# config.active_record.schema_format = :sql
|
||||
|
||||
|
||||
begin
|
||||
require 'database_cleaner'
|
||||
DatabaseCleaner.strategy = :truncation
|
||||
DatabaseCleaner.orm = "mongoid"
|
||||
rescue LoadError => ignore_if_database_cleaner_not_present
|
||||
puts "Error on cleaner"
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user