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:
parent
5637fa4e4c
commit
da9bcb8bec
3 changed files with 10 additions and 5 deletions
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
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
|
||||||
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)
|
||||||
|
|
|
||||||
|
|
@ -30,4 +30,13 @@ Diaspora::Application.configure do
|
||||||
# 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
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue