facebooker 1.0.31 → 1.0.41

data/test/facebooker/models/user_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 require 'active_support'
 
 class Facebooker::UserTest < Test::Unit::TestCase
-  
+
   def setup
     @session = Facebooker::Session.create('apikey', 'secretkey')
     @user = Facebooker::User.new(1234, @session)
@@ -10,19 +10,24 @@ class Facebooker::UserTest < Test::Unit::TestCase
     ENV['FACEBOOK_CANVAS_PATH'] ='facebook_app_name'
     ENV['FACEBOOK_API_KEY'] = '1234567'
     ENV['FACEBOOK_SECRET_KEY'] = '7654321'
-    
+
     @user.friends = [@other_user]
   end
-  
+
   def test_has_permission
     expect_http_posts_with_responses(has_app_permission_response_xml)
-    assert @user.has_permission?("status_update")
+    assert @user.has_permission?("status_update")    
   end
-  
+
+  def test_has_permissions
+    expect_http_posts_with_responses(has_app_permission_response_xml, has_app_permission_response_xml)    
+    assert @user.has_permissions?(["status_update", "read_stream"])    
+  end 
+ 
   def test_can_ask_user_if_he_or_she_is_friends_with_another_user
     assert(@user.friends_with?(@other_user))
   end
-  
+
   def test_can_ask_user_if_he_or_she_is_friends_with_another_user_by_user_id
     assert(@user.friends_with?(@other_user.id))
   end
@@ -35,14 +40,14 @@ class Facebooker::UserTest < Test::Unit::TestCase
   def test_uid_is_always_an_integer
     assert_equal 1234, Facebooker::User.new(:uid => "1234").uid
     assert_equal 1234, Facebooker::User.new(:id  => "1234").uid
-    
+
     assert_equal 1234, Facebooker::User.new(:uid => "1234").id
     assert_equal 1234, Facebooker::User.new(:id  => "1234").id
-    
+
     assert_equal 1234, Facebooker::User.new(:uid => "1234").facebook_id
     assert_equal 1234, Facebooker::User.new(:id  => "1234").facebook_id
   end
-  
+
   def test_cast_to_friend_list_id_with_nil
     assert_nil @user.cast_to_friend_list_id(nil)
   end
@@ -56,7 +61,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   def test_cast_to_friend_list_id_with_friend_list
     assert_equal 199,@user.cast_to_friend_list_id(Facebooker::FriendList.new(:flid=>199,:name=>"Work"))
   end
-  
+
   def test_cast_to_friend_list_id_with_invalid_string_raises
     @user.expects(:friend_lists).returns([Facebooker::FriendList.new(:flid=>1,:name=>"Not Picked")])
     assert_nil @user.cast_to_friend_list_id("Something")
@@ -64,7 +69,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   rescue   Facebooker::Session::InvalidFriendList
     nil
   end
-  
+
   def test_can_create_from_current_session
     Facebooker::Session.expects(:current).returns("current")
     user=Facebooker::User.new(1)
@@ -74,7 +79,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   def test_raises_when_no_session_bound
     assert_raises(Facebooker::Model::UnboundSessionException) { Facebooker::User.new(1, nil).populate }
   end
-  
+
   def test_can_set_mobile_fbml
     @user.expects(:set_profile_fbml).with(nil,"test",nil,nil)
     @user.mobile_fbml="test"
@@ -87,52 +92,69 @@ class Facebooker::UserTest < Test::Unit::TestCase
     @user.expects(:set_profile_fbml).with("test",nil,nil,nil)
     @user.profile_fbml="test"
   end
-  
+
   def test_can_set_profile_main
     @user.expects(:set_profile_fbml).with(nil,nil,nil,"test")
     @user.profile_main="test"
   end
-  
+
   def test_can_call_set_profile_fbml
     @session.expects(:post).with('facebook.profile.setFBML', {:uid=>1234,:profile=>"profile",:profile_action=>"action",:mobile_profile=>"mobile"},false)
     @user.set_profile_fbml("profile","mobile","action")
   end
-  
+
   def test_can_call_set_profile_fbml_with_profile_main
     @session.expects(:post).with('facebook.profile.setFBML', {:uid=>1234,:profile=>"profile",:profile_action=>"action",:mobile_profile=>"mobile", :profile_main => 'profile_main'},false)
     @user.set_profile_fbml("profile","mobile","action",'profile_main')
   end
-  
+
   def test_can_get_profile_photos
     @user.expects(:profile_photos)
     @user.profile_photos
   end
-  
+
   def test_can_set_cookie
     @user.expects(:set_cookie).with('name', 'value')
     @user.set_cookie('name', 'value')
   end
-  
+
   def test_can_get_cookies
     @user.expects(:get_cookies).with('name')
     @user.get_cookies('name')
   end
-  
+
   def test_get_profile_photos
     @user = Facebooker::User.new(548871286, @session)
-    expect_http_posts_with_responses(example_profile_photos_get_xml)    
+    expect_http_posts_with_responses(example_profile_photos_get_xml)
     photos = @user.profile_photos
     assert_equal "2357384227378429949", photos.first.aid
   end
+
+  def test_publish_to
+    @user = Facebooker::User.new(548871286, @session)
+    expect_http_posts_with_responses(example_profile_publish_to_get_xml)
+    @user.publish_to(@other_user, :message => 'i love you man')
+  end
+  def test_publish_to_converts_attachment_to_json
+    @user = Facebooker::User.new(548871286, @session)
+    @user.session.expects(:post).with("facebook.stream.publish",has_entry(:attachment=>instance_of(String)))
+    @user.publish_to(@other_user, :message => 'i love you man',:attachment=>{:a=>"b"})
+  end
+
+  def test_comment_on
+    @user = Facebooker::User.new(548871286, @session)
+    expect_http_posts_with_responses(example_comment_on_response)
+    assert_equal('703826862_78463536863', @user.comment_on('703826862_78463536862', :message => 'that was hilarious!'))
+  end
   
   def test_can_send_email
     @user.expects(:send_email).with("subject", "body text")
     @user.send_email("subject", "body text")
-    
+
     @user.expects(:send_email).with("subject", nil, "body fbml")
     @user.send_email("subject", nil, "body fbml")
   end
-  
+
   def test_doesnt_post_to_facebook_when_assigning_status
     @session.expects(:post).never
     @user.status="my status"
@@ -141,7 +163,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
     @session.expects(:post).with('facebook.users.setStatus', {:status=>"my status",:status_includes_verb=>1, :uid => @user.uid}, false)
     @user.set_status("my status")
   end
-  
+
   def test_get_events
     @user = Facebooker::User.new(9507801, @session)
     expect_http_posts_with_responses(example_events_get_xml)
@@ -158,33 +180,33 @@ class Facebooker::UserTest < Test::Unit::TestCase
     @session.expects(:post).never
     assert_equal 1,@user.events.first.eid
   end
-  
-  
+
+
   def test_to_s
     assert_equal("1234",@user.to_s)
   end
-  
+
   def test_equality_with_same_id
     assert_equal @user, @user.dup
     assert_equal @user, Facebooker::User.new(:id => @user.id)
   end
-  
+
   def test_not_equal_to_differnt_class
     assert_not_equal @user, flexmock(:id => @user.id)
   end
-  
+
   def test_hash_email
     assert_equal "4228600737_c96da02bba97aedfd26136e980ae3761", Facebooker::User.hash_email("mary@example.com")
   end
   def test_hash_email_not_normalized
     assert_equal "4228600737_c96da02bba97aedfd26136e980ae3761", Facebooker::User.hash_email(" MaRy@example.com  ")
   end
-  
+
   def test_register_with_array
     expect_http_posts_with_responses(register_response_xml)
     assert_equal ["4228600737_c96da02bba97aedfd26136e980ae3761"],Facebooker::User.register([{:email=>"mary@example.com",:account_id=>1}])
   end
-  
+
   def test_unregister_with_array
     expect_http_posts_with_responses(unregister_response_xml)
     assert_equal ["4228600737_c96da02bba97aedfd26136e980ae3761"],Facebooker::User.unregister(["4228600737_c96da02bba97aedfd26136e980ae3761"])
@@ -194,7 +216,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
     expect_http_posts_with_responses(unregister_response_xml)
     assert_equal ["mary@example.com"],Facebooker::User.unregister_emails(["mary@example.com"])
   end
-  
+
   def test_register_with_array_raises_if_not_all_success
     expect_http_posts_with_responses(register_response_xml)
     assert_equal ["4228600737_c96da02bba97aedfd26136e980ae3761"],Facebooker::User.register([{:email=>"mary@example.com",:account_id=>1},{:email=>"mike@example.com",:account_id=>2}])
@@ -202,7 +224,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   rescue Facebooker::Session::UserRegistrationFailed => e
     assert_equal({:email=>"mike@example.com",:account_id=>2},e.failed_users.first)
   end
-  
+
   def test_unregister_with_array_raises_if_not_all_success
     expect_http_posts_with_responses(unregister_response_xml)
     assert_equal ["4228600737_c96da02bba97aedfd26136e980ae3761"],Facebooker::User.unregister(["4228600737_c96da02bba97aedfd26136e980ae3761","3587916587_791214eb452bf4de30e957d65a0234d4"])
@@ -219,19 +241,19 @@ class Facebooker::UserTest < Test::Unit::TestCase
     assert_equal("mike@example.com",e.failed_users.first)
   end
 
-  
+
   def test_get_locale
     @user = Facebooker::User.new(9507801, @session)
     expect_http_posts_with_responses(example_users_get_info_xml)
     assert_equal "en_US", @user.locale
   end
-  
+
   def test_get_profile_url
     @user = Facebooker::User.new(8055, @session)
     expect_http_posts_with_responses(example_users_get_info_xml)
     assert_equal "http://www.facebook.com/profile.php?id=8055", @user.profile_url
   end
-  
+
   private
   def example_profile_photos_get_xml
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -262,7 +284,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
        </photo>
     </photos_get_response>"
   end
-  
+
   def example_events_get_xml
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
     <events_get_response xmlns=\"http://api.facebook.com/1.0/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://api.facebook.com/1.0/ http://api.facebook.com/1.0/facebook.xsd\" list=\"true\">
@@ -294,31 +316,31 @@ class Facebooker::UserTest < Test::Unit::TestCase
       </event>
     </events_get_response>"
   end
-  
+
   def example_users_get_info_xml
     <<-XML
     <?xml version="1.0" encoding="UTF-8"?> <users_getInfo_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/ http://api.facebook.com/1.0/facebook.xsd" list="true"> <user> <uid>8055</uid> <about_me>This field perpetuates the glorification of the ego. Also, it has a character limit.</about_me> <activities>Here: facebook, etc. There: Glee Club, a capella, teaching.</activities> <affiliations list="true"> <affiliation> <nid>50453093</nid> <name>Facebook Developers</name> <type>work</type> <status/> <year/> </affiliation> </affiliations> <birthday>November 3</birthday> <books>The Brothers K, GEB, Ken Wilber, Zen and the Art, Fitzgerald, The Emporer's New Mind, The Wonderful Story of Henry Sugar</books> <current_location> <city>Palo Alto</city> <state>CA</state> <country>United States</country> <zip>94303</zip> </current_location> <education_history list="true"> <education_info> <name>Harvard</name> <year>2003</year> <concentrations list="true"> <concentration>Applied Mathematics</concentration> <concentration>Computer Science</concentration> </concentrations> </education_info> </education_history> <first_name>Dave</first_name> <hometown_location> <city>York</city> <state>PA</state> <country>United States</country> </hometown_location> <hs_info> <hs1_name>Central York High School</hs1_name> <hs2_name/> <grad_year>1999</grad_year> <hs1_id>21846</hs1_id> <hs2_id>0</hs2_id> </hs_info> <is_app_user>1</is_app_user> <has_added_app>1</has_added_app> <interests>coffee, computers, the funny, architecture, code breaking,snowboarding, philosophy, soccer, talking to strangers</interests> <last_name>Fetterman</last_name> <locale>en_US</locale> <meeting_for list="true"> <seeking>Friendship</seeking> </meeting_for> <meeting_sex list="true"> <sex>female</sex> </meeting_sex> <movies>Tommy Boy, Billy Madison, Fight Club, Dirty Work, Meet the Parents, My Blue Heaven, Office Space </movies> <music>New Found Glory, Daft Punk, Weezer, The Crystal Method, Rage, the KLF, Green Day, Live, Coldplay, Panic at the Disco, Family Force 5</music> <name>Dave Fetterman</name> <notes_count>0</notes_count> <pic>http://photos-055.facebook.com/ip007/profile3/1271/65/s8055_39735.jpg</pic> <pic_big>http://photos-055.facebook.com/ip007/profile3/1271/65/n8055_39735.jpg</pic_big> <pic_small>http://photos-055.facebook.com/ip007/profile3/1271/65/t8055_39735.jpg</pic_small> <pic_square>http://photos-055.facebook.com/ip007/profile3/1271/65/q8055_39735.jpg</pic_square> <political>Moderate</political> <profile_update_time>1170414620</profile_update_time> <profile_url>http://www.facebook.com/profile.php?id=8055</profile_url> <quotes/> <relationship_status>In a Relationship</relationship_status> <religion/> <sex>male</sex> <significant_other_id xsi:nil="true"/> <status> <message>Fast Company, November issue, page 84</message> <time>1193075616</time> </status> <timezone>-8</timezone> <tv>cf. Bob Trahan</tv> <wall_count>121</wall_count> <work_history list="true"> <work_info> <location> <city>Palo Alto</city> <state>CA</state> <country>United States</country> </location> <company_name>Facebook</company_name> <position>Software Engineer</position> <description>Tech Lead, Facebook Platform</description> <start_date>2006-01</start_date> <end_date/> </work_info> </work_history> </user> </users_getInfo_response>
     XML
   end
-  
+
   def register_response_xml
     <<-XML
-    <?xml version="1.0" encoding="UTF-8"?> 
-    <connect_registerUsers_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/facebook.xsd" list="true"> 
-      <connect_registerUsers_response_elt>4228600737_c96da02bba97aedfd26136e980ae3761</connect_registerUsers_response_elt> 
+    <?xml version="1.0" encoding="UTF-8"?>
+    <connect_registerUsers_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/facebook.xsd" list="true">
+      <connect_registerUsers_response_elt>4228600737_c96da02bba97aedfd26136e980ae3761</connect_registerUsers_response_elt>
     </connect_registerUsers_response>
     XML
   end
-  
+
   def unregister_response_xml
     <<-XML
-    <?xml version="1.0" encoding="UTF-8"?> 
-    <connect_unregisterUsers_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/facebook.xsd" list="true"> 
-      <connect_unregisterUsers_response_elt>4228600737_c96da02bba97aedfd26136e980ae3761</connect_unregisterUsers_response_elt> 
+    <?xml version="1.0" encoding="UTF-8"?>
+    <connect_unregisterUsers_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/facebook.xsd" list="true">
+      <connect_unregisterUsers_response_elt>4228600737_c96da02bba97aedfd26136e980ae3761</connect_unregisterUsers_response_elt>
     </connect_unregisterUsers_response>
     XML
-  end  
-  
+  end
+
   def has_app_permission_response_xml
     <<-XML
     <?xml version="1.0" encoding="UTF-8"?>
@@ -327,5 +349,18 @@ class Facebooker::UserTest < Test::Unit::TestCase
       xsi:schemaLocation="http://api.facebook.com/1.0/ http://api.facebook.com/1.0/facebook.xsd">1</users_hasAppPermission_response>
     XML
   end
-  
+
+  def example_profile_publish_to_get_xml
+    <<-eoxml
+<?xml version="1.0" encoding="UTF-8"?>
+<stream_publish_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/ http://api.facebook.com/1.0/facebook.xsd">703826862_78463536862</stream_publish_response>
+    eoxml
+  end
+  
+  def example_comment_on_response
+    <<-eoxml
+<?xml version="1.0" encoding="UTF-8"?>
+<stream_addComment_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/ http://api.facebook.com/1.0/facebook.xsd">703826862_78463536863</stream_addComment_response>
+    eoxml
+  end  
 end

data/test/facebooker/rails/facebook_request_fix_2-3_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../rails_test_helper')
+require 'facebooker/rails/facebook_request_fix_2-3' if Rails.version >= '2.3'
+class Facebooker::Rails::FacebookRequestFix23Test < Test::Unit::TestCase
+
+  def setup
+    ENV['FACEBOOK_API_KEY'] = '1234567'
+    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    if Rails.version < '2.3'      
+      @request = ActionController::TestRequest.new({"fb_sig_is_ajax"=>"1"}, {}, nil)
+      
+    else
+      @request = ActionController::TestRequest.new
+      @request.query_parameters[:fb_sig_is_ajax] = "1"
+    end
+  end
+
+  def test_xhr_when_is_ajax
+    assert @request.xhr?
+  end
+
+  def test_xml_http_request_when_is_ajax
+    assert @request.xml_http_request?
+  end
+
+end

data/test/facebooker/rails/facebook_url_rewriting_test.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../rails_test_helper')
+
+class Facebooker::Rails::FacebookUrlRewritingTest < Test::Unit::TestCase
+
+  def setup
+    @request = ActionController::TestRequest.new
+    @params = {}
+    @rewriter = ActionController::UrlRewriter.new(@request, @params)
+  end
+
+  def test_one_or_true_on_string_1
+    assert @rewriter.one_or_true( "1" )
+  end
+  
+  def test_one_or_true_on_string_0
+    assert !@rewriter.one_or_true( "0" )
+  end
+
+  def test_one_or_true_on_integer_1
+    assert @rewriter.one_or_true( 1 )
+  end
+
+  def test_one_or_true_on_float_1
+    assert @rewriter.one_or_true( 1.0 )
+  end
+  
+  def test_one_or_true_on_true
+    assert @rewriter.one_or_true( true )
+  end
+
+  def test_one_or_true_on_false
+    assert !@rewriter.one_or_true( false )
+  end
+
+  def test_one_or_true_on_nil
+    assert !@rewriter.one_or_true( nil )
+  end
+
+end

data/test/facebooker/rails/publisher_test.rb

@@ -427,6 +427,10 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     assert_equal('http://apps.facebook.com/mike/pokes/do/1',route_image.href)
   end
 
+  def test_image_holder_equality
+    assert_equal TestPublisher::ImageHolder.new('image.png', 'raw_string'), TestPublisher::ImageHolder.new('image.png', 'raw_string')
+  end
+
   def test_image_to_json_puts_src_first
     string_image = TestPublisher.new.image('image.png', 'raw_string')
     assert_equal "{\"src\":\"/images/image.png\", \"href\":\"raw_string\"}",string_image.to_json
@@ -437,7 +441,7 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
 
   def test_default_url_options
     Facebooker.expects(:facebook_path_prefix).returns("/mike")
-    assert_equal({:host=>"apps.facebook.com/mike"},TestPublisher.default_url_options)
+    assert_equal({:host=>"apps.facebook.com/mike"},TestPublisher.new.default_url_options)
   end
 
   def test_recipients

data/test/facebooker/rails_integration_test.rb

@@ -37,6 +37,13 @@ class FBConnectController < NoisyController
   end
 end
 
+class FBConnectControllerProxy < NoisyController
+  before_filter :create_facebook_session_with_secret
+  def index
+    render :text => 'score!'
+  end
+end
+
 class ControllerWhichRequiresFacebookAuthentication < NoisyController
   ensure_authenticated_to_facebook
   def index
@@ -259,13 +266,13 @@ class RailsIntegrationTestForApplicationInstallation < Test::Unit::TestCase
   def test_if_controller_requires_application_installation_unauthenticated_requests_will_redirect_to_install_page
     get :index
     assert_response :redirect
-    assert_equal("http://www.facebook.com/install.php?api_key=1234567&v=1.0", @response.headers['Location'])
+    assert_equal("http://www.facebook.com/install.php?api_key=1234567&v=1.0&next=http%3A%2F%2Ftest.host%2Frequire_install", @response.headers['Location'])
   end
   
   def test_if_controller_requires_application_installation_authenticated_requests_without_installation_will_redirect_to_install_page
     get :index, facebook_params(:fb_sig_added => nil)
     assert_response :success
-    assert_equal("<fb:redirect url=\"http://www.facebook.com/install.php?api_key=1234567&v=1.0\" />", @response.body)
+    assert(@response.body =~ /fb:redirect/)
   end
   
   def test_if_controller_requires_application_installation_authenticated_requests_with_installation_will_render
@@ -297,7 +304,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
   def test_if_controller_requires_facebook_authentication_unauthenticated_requests_will_redirect
     get :index
     assert_response :redirect
-    assert_equal("http://www.facebook.com/login.php?api_key=1234567&v=1.0", @response.headers['Location'])
+    assert_equal("http://www.facebook.com/login.php?api_key=1234567&v=1.0&next=http%3A%2F%2Ftest.host%2Frequire_auth", @response.headers['Location'])
   end
 
   def test_facebook_params_are_parsed_into_a_separate_hash
@@ -372,6 +379,20 @@ class RailsIntegrationTest < Test::Unit::TestCase
     assert_equal(1111111, @controller.facebook_session.user.id)
   end
 
+  def test_session_can_be_secured_with_secret
+    @controller = FBConnectControllerProxy.new
+    auth_token = 'ohaiauthtokenhere111'
+    modified_params = facebook_params
+    modified_params.delete('fb_sig_session_key')
+    modified_params['auth_token'] = auth_token
+    modified_params['generate_session_secret'] = true
+    session_mock = flexmock(session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']))
+    session_params = { 'session_key' => '123', 'uid' => '321' }
+    session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token, :generate_session_secret => "1").once.and_return(session_params).ordered
+    flexmock(@controller).should_receive(:new_facebook_session).once.and_return(session).ordered
+    get :index, modified_params
+  end
+
   def test_session_can_be_secured_with_auth_token
     auth_token = 'ohaiauthtokenhere111'
     modified_params = facebook_params
@@ -379,7 +400,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
     modified_params['auth_token'] = auth_token
     session_mock = flexmock(session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']))
     session_params = { 'session_key' => '123', 'uid' => '321' }
-    session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token).once.and_return(session_params).ordered
+    session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token, :generate_session_secret => "0").once.and_return(session_params).ordered
     flexmock(@controller).should_receive(:new_facebook_session).once.and_return(session).ordered
     get :index, modified_params
   end
@@ -391,7 +412,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
       modified_params['auth_token'] = auth_token
       session_mock = flexmock(session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']))
       session_params = { 'session_key' => '123', 'uid' => '321' }
-      session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token).once.and_return(session_params).ordered
+      session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token, :generate_session_secret => "0").once.and_return(session_params).ordered
       flexmock(@controller).should_receive(:new_facebook_session).once.and_return(session).ordered
       setup_fb_connect_cookies(expired_cookie_hash_for_auth)
       get :index, modified_params
@@ -425,7 +446,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
   def test_redirect_to_renders_fbml_redirect_tag_if_request_is_for_a_facebook_canvas
     get :index, facebook_params(:fb_sig_user => nil)
     assert_response :success
-    assert_equal("<fb:redirect url=\"http://www.facebook.com/login.php?api_key=1234567&v=1.0\" />", @response.body)
+    assert @response.body =~ /fb:redirect/
   end
   
   def test_redirect_to_renders_javascript_redirect_if_request_is_for_a_facebook_iframe
@@ -433,7 +454,6 @@ class RailsIntegrationTest < Test::Unit::TestCase
     assert_response :success
     assert_match "javascript", @response.body
     assert_match "http-equiv", @response.body
-    assert_match "http://www.facebook.com/login.php?api_key=1234567&v=1.0".to_json, @response.body
     assert_match "http://www.facebook.com/login.php?api_key=1234567&amp;v=1.0", @response.body
   end
 
@@ -643,6 +663,22 @@ class RailsHelperTest < Test::Unit::TestCase
     
   end
   
+  def test_fb_prompt_permissions_valid_no_callback
+    assert_equal "<fb:prompt-permission perms=\"publish_stream,read_stream\">Can I read and write your streams?</fb:prompt-permission>",
+                 @h.fb_prompt_permissions(['publish_stream', 'read_stream'],"Can I read and write your streams?")    
+  end
+  
+  def test_fb_prompt_permissions_valid_with_callback
+    assert_equal "<fb:prompt-permission next_fbjs=\"do_stuff()\" perms=\"publish_stream,read_stream\">Can I read and write your streams?</fb:prompt-permission>",
+                 @h.fb_prompt_permissions(['publish_stream', 'read_stream'],"Can I read and write your streams?", "do_stuff()")    
+  end
+  
+  def test_fb_prompt_permissions_invalid_option
+    assert_raises(ArgumentError) {@h.fb_prompt_permissions(["invliad", "read_stream"], "a message")}
+    
+  end  
+ 
+  
   def test_fb_add_profile_section
     assert_equal "<fb:add-section-button section=\"profile\" />",@h.fb_add_profile_section
   end
@@ -1000,6 +1036,14 @@ class RailsHelperTest < Test::Unit::TestCase
     assert @h.init_fb_connect("XFBML", :js => :jquery).match(/\$\(document\).ready\(/)
   end
 
+  def test_init_fb_connect_without_options_app_settings
+    assert @h.init_fb_connect().match(/, \{\}\)/)
+  end
+  
+  def test_init_fb_connect_with_options_app_settings
+    assert @h.init_fb_connect(:app_settings => "{foo: bar}").match(/, \{foo: bar\}\)/)
+  end
+  
   
   def test_fb_login_and_redirect
     assert_equal @h.fb_login_and_redirect("/path"),"<fb:login-button onlogin=\"window.location.href = &quot;/path&quot;;\"></fb:login-button>"
@@ -1010,7 +1054,7 @@ class RailsHelperTest < Test::Unit::TestCase
   end
   def test_fb_user_action
     action = Facebooker::Rails::Publisher::UserAction.new
-    assert_equal @h.fb_user_action(action,"message","prompt"),"FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, null, \"prompt\", \"message\");"
+    assert_equal @h.fb_user_action(action,"message","prompt"),"FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, null, \"prompt\", {\"value\": \"message\"});"
   end