Skip to content
Extraits de code Groupes Projets
Valider da9bcb8b rédigé par maxwell's avatar maxwell
Parcourir les fichiers

just kidding. needed that test config, but pulled out some deprecated curl...

just kidding.  needed that test config, but pulled out some deprecated curl stuff hanging around statusmessages and checked tests accordingly
parent 5637fa4e
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -39,7 +39,7 @@ class StatusMessagesController < ApplicationController ...@@ -39,7 +39,7 @@ class StatusMessagesController < ApplicationController
respond_to do |format| respond_to do |format|
format.html format.html
format.xml { render :xml => @status_message } format.xml { render :xml => Post.build_xml_for(@status_message) }
format.json { render :json => @status_message } format.json { render :json => @status_message }
end end
end end
......
class StatusMessage < Post class StatusMessage < Post
include StatusMessagesHelper include StatusMessagesHelper
require 'lib/net/curl'
xml_name :status_message xml_name :status_message
...@@ -19,9 +18,6 @@ class StatusMessage < Post ...@@ -19,9 +18,6 @@ class StatusMessage < Post
StatusMessage.newest(User.first.email) StatusMessage.newest(User.first.email)
end end
def self.retrieve_from_friend(friend)
StatusMessages.from_xml Curl.get(friend.url+"status_messages.xml")
end
def ==(other) def ==(other)
(self.message == other.message) && (self.owner == other.owner) (self.message == other.message) && (self.owner == other.owner)
......
...@@ -29,5 +29,14 @@ Diaspora::Application.configure do ...@@ -29,5 +29,14 @@ Diaspora::Application.configure do
# This is necessary if your schema can't be completely dumped by the schema dumper, # 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 # like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql # 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 end
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter