From 9e4e58e002ca45dcda146c5a62b88db5bdb3d3e5 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Mon, 12 Dec 2011 10:59:15 -0800
Subject: [PATCH] fix facebook specs; comment controller specs
---
app/controllers/comments_controller.rb | 2 +-
app/models/services/facebook.rb | 1 -
spec/controllers/comments_controller_spec.rb | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 98930ccca4..4392952506 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -26,7 +26,7 @@ class CommentsController < ApplicationController
Postzord::Dispatcher.build(current_user, @comment).post
respond_to do |format|
- format.json { render :json => @comment.as_api_response(:backbone) }
+ format.json { render :json => @comment.as_api_response(:backbone), :status => 201 }
format.html{ render :nothing => true, :status => 201 }
format.mobile{ render :partial => 'comment', :locals => {:post => @comment.post, :comment => @comment} }
end
diff --git a/app/models/services/facebook.rb b/app/models/services/facebook.rb
index 45ee847e07..7564637c34 100644
--- a/app/models/services/facebook.rb
+++ b/app/models/services/facebook.rb
@@ -42,7 +42,6 @@ class Services::Facebook < Service
end
def save_friends
- return
url = "https://graph.facebook.com/me/friends?fields[]=name&fields[]=picture&access_token=#{URI.escape(self.access_token)}"
response = Faraday.get(url)
data = JSON.parse(response.body)['data']
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index 6207440f70..8c8a8804e2 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -22,8 +22,8 @@ describe CommentsController do
@post = alice.post :status_message, :text => 'GIANTS', :to => aspect_to_post
end
- it 'responds to format js' do
- post :create, comment_hash.merge(:format => 'js')
+ it 'responds to format json' do
+ post :create, comment_hash.merge(:format => 'json')
response.code.should == '201'
response.body.should match comment_hash[:text]
end
--
GitLab