community_engine 2.3.2 → 3.0.0

data/test/functional/albums_controller_test.rb

@@ -42,9 +42,9 @@ class AlbumsControllerTest < ActionController::TestCase
 
   test "should update album" do
     login_as :quentin
-    put :update, :id => albums(:one).id, :album => { }, :go_to => 'only_create', :user_id => users(:quentin)
+    patch :update, :id => albums(:one).id, :album => { }, :go_to => 'only_create', :user_id => users(:quentin)
     assert_redirected_to user_album_path(users(:quentin), albums(:one))
-    put :update, :id => albums(:one).id, :album => { }, :go_to => '', :user_id => users(:quentin)
+    patch :update, :id => albums(:one).id, :album => { }, :go_to => '', :user_id => users(:quentin)
     assert_redirected_to new_user_album_photo_path(users(:quentin),albums(:one))
   end
 
@@ -78,7 +78,7 @@ class AlbumsControllerTest < ActionController::TestCase
   
   # Public access
   test "should show album and not update counter" do
-    get :show, :id => 1, :user_id => users(:quentin)
+    get :show, :id => albums(:one).id, :user_id => users(:quentin)
     assert_response :success
     assert assigns(:album)
     assert_equal assigns(:album_photos).size, 1  
@@ -96,7 +96,7 @@ class AlbumsControllerTest < ActionController::TestCase
 
   test "should not update another user's album" do
     login_as :joe
-    put :update, :user_id => users(:quentin), :id => albums(:one), :album => {:title => 'Fooo!'}
+    patch :update, :user_id => users(:quentin), :id => albums(:one), :album => {:title => 'Fooo!'}
     assert !albums(:one).reload.title.eql?('Fooo!')
     assert_response :redirect
   end  

data/test/functional/categories_controller_test.rb

@@ -25,26 +25,26 @@ class CategoriesControllerTest < ActionController::TestCase
   end
 
   def test_should_show_category
-    get :show, :id => 1
+    get :show, :id => categories(:how_to).id
     assert_response :success
   end
 
   def test_should_get_edit
     login_as :admin
-    get :edit, :id => 1
+    get :edit, :id => categories(:how_to).id
     assert_response :success
   end
   
   def test_should_update_category
     login_as :admin
-    put :update, :id => 1, :category => { }
+    patch :update, :id => categories(:how_to).id, :category => { }
     assert_redirected_to category_path(assigns(:category))
   end
   
   def test_should_destroy_category
     login_as :admin
     assert_difference Category, :count, -1 do
-      delete :destroy, :id => 1
+      delete :destroy, :id => categories(:how_to).id
     end
     assert_redirected_to categories_path
   end

data/test/functional/clippings_controller_test.rb

@@ -95,19 +95,19 @@ class ClippingsControllerTest < ActionController::TestCase
 
   def test_should_show_clipping
     login_as :quentin
-    get :show, :id => 1, :user_id => users(:quentin)
+    get :show, :id => clippings(:google).id, :user_id => users(:quentin)
     assert_response :success
   end
 
   def test_should_get_edit
     login_as :quentin
-    get :edit, :id => 1, :user_id => users(:quentin)
+    get :edit, :id => clippings(:google).id, :user_id => users(:quentin)
     assert_response :success
   end
   
   def test_should_update_clipping
     login_as :quentin
-    put :update, :id => 1,
+    patch :update, :id => clippings(:google).id,
       :clipping => {:url => 'changed url'},
       :user_id => users(:quentin),
       :tag_list => 'tagX, tagY'
@@ -120,7 +120,7 @@ class ClippingsControllerTest < ActionController::TestCase
   def test_should_destroy_clipping
     login_as :quentin
     assert_difference Clipping, :count, -1 do
-      delete :destroy, :id => 1, :user_id => users(:quentin)
+      delete :destroy, :id => clippings(:google).id, :user_id => users(:quentin)
       assert_redirected_to user_clippings_path(users(:quentin))
     end
     

data/test/functional/comments_controller_test.rb

@@ -120,21 +120,25 @@ class CommentsControllerTest < ActionController::TestCase
   end
 
   def test_should_unsubscribe_with_token
-    configatron.allow_anonymous_commenting = true
-    comment = Comment.create!(:comment => 'foo', :author_email => 'bar@foo.com', :author_ip => '123.123.123', :recipient => users(:quentin), :commentable => users(:quentin), :notify_by_email => true)
-    configatron.allow_anonymous_commenting = false
+    configatron.temp do
+      configatron.allow_anonymous_commenting = true
+      comment = Comment.create!(:comment => 'foo', :author_email => 'bar@foo.com', :author_ip => '123.123.123', :recipient => users(:quentin), :commentable => users(:quentin), :notify_by_email => true)
+      configatron.allow_anonymous_commenting = false
 
-    get :unsubscribe, :commentable_type => comment.commentable_type, :commentable_id => comment.commentable_id, :id => comment.id, :token => comment.token_for('bar@foo.com'), :email => 'bar@foo.com'
-    assert comment.reload.notify_by_email.eql?(false)
+      get :unsubscribe, :commentable_type => comment.commentable_type, :commentable_id => comment.commentable_id, :id => comment.id, :token => comment.token_for('bar@foo.com'), :email => 'bar@foo.com'
+      assert comment.reload.notify_by_email.eql?(false)
+    end
   end
 
   def test_should_not_unsubscribe_with_bad_token
-    configatron.allow_anonymous_commenting = true
-    comment = Comment.create!(:comment => 'foo', :author_email => 'bar@foo.com', :author_ip => '123.123.123', :recipient => users(:quentin), :commentable => users(:quentin), :notify_by_email => true)
-    configatron.allow_anonymous_commenting = false
+    configatron.temp do
+      configatron.allow_anonymous_commenting = true
+      comment = Comment.create!(:comment => 'foo', :author_email => 'bar@foo.com', :author_ip => '123.123.123', :recipient => users(:quentin), :commentable => users(:quentin), :notify_by_email => true)
+      configatron.allow_anonymous_commenting = false
 
-    get :unsubscribe, :commentable_type => 'User', :commentable_id => users(:quentin).to_param, :id => comment.id, :token => 'badtokengoeshere'
-    assert comment.reload.notify_by_email.eql?(true)
+      get :unsubscribe, :commentable_type => 'User', :commentable_id => users(:quentin).to_param, :id => comment.id, :token => 'badtokengoeshere'
+      assert comment.reload.notify_by_email.eql?(true)
+    end
   end
 
   def test_should_get_edit_js_as_admin
@@ -146,18 +150,18 @@ class CommentsControllerTest < ActionController::TestCase
   def test_should_update_as_admin
     login_as :admin
     edited_text = 'edited the comment body'
-    put :update, :id => comments(:quentins_comment_on_his_own_post), :comment => {:comment => edited_text}, :format => 'js'
-
+    patch :update, :id => comments(:quentins_comment_on_his_own_post), :comment => {:comment => edited_text}, :format => 'js'
+    
     assert assigns(:comment).comment.eql?(edited_text)
     assert_response :success
   end
 
   def test_should_not_update_if_not_admin_or_moderator
     login_as :quentin
-
-    edited_text = 'edited the comment body'
-    put :update, :id => comments(:quentins_comment_on_his_own_post), :comment => {:comment => edited_text}, :format => "js"
-
+    
+    edited_text = 'edited the comment body'    
+    patch :update, :id => comments(:quentins_comment_on_his_own_post), :comment => {:comment => edited_text}, :format => "js"
+    
     assert_response :success #js redirect
     assert_not_equal(comments(:quentins_comment_on_his_own_post).comment, edited_text)
   end

data/test/functional/events_controller_test.rb

@@ -34,19 +34,19 @@ class EventsControllerTest < ActionController::TestCase
 
   def test_should_get_edit
     login_as :admin
-    get :edit, :id => 1
+    get :edit, :id => events(:cool_event).id
     assert_response :success
   end
 
   def test_should_update_event
     login_as :admin
-    put :update, :id => 1, :event => {:name => 'changed name' }
+    patch :update, :id => events(:cool_event).id, :event => {:name => 'changed name' }
     assert_redirected_to event_path(assigns(:event))
   end
 
   def test_should_fail_to_update_event
     login_as :admin
-    put :update, :id => 1, :event => { :name => nil }
+    patch :update, :id => events(:cool_event).id, :event => { :name => nil }
     assert assigns(:event).errors[:name]
     assert_response :success
   end
@@ -55,7 +55,7 @@ class EventsControllerTest < ActionController::TestCase
     @request.env["HTTP_REFERER"] = 'http://test.host/admin/events'
     login_as :admin
     assert_difference Event, :count, -1 do
-      delete :destroy, :id => 1
+      delete :destroy, :id => events(:cool_event).id
     end
     assert_redirected_to admin_events_path
   end
@@ -84,14 +84,14 @@ class EventsControllerTest < ActionController::TestCase
     login_as :admin
     get :show, :id=>2
     assert_tag :tag=>'a', :content=>:rsvp.l
-    assert_tag :tag=>'b', :content=>"#{:rsvps.l}:"
+    assert_tag :tag=>'dt', :content=>"#{:rsvps.l}"
   end
 
   def test_should_not_show_rsvp
     login_as :admin
     get :show, :id=>6
     assert_no_tag :tag=>'a', :content=>:rsvp.l
-    assert_no_tag :tag=>'b', :content=>"#{:rsvps.l}:"
+    assert_no_tag :tag=>'dt', :content=>"#{:rsvps.l}"
   end
   
   def test_should_clone_event

data/test/functional/forums_controller_test.rb

@@ -41,7 +41,7 @@ class ForumsControllerTest < ActionController::TestCase
   end
   
   def test_should_show_forum
-    get :show, :id => 1
+    get :show, :id => forums(:rails).id
     assert_response :success
     assert assigns(:topics)
     # sticky should be first
@@ -50,20 +50,20 @@ class ForumsControllerTest < ActionController::TestCase
   
   def test_should_show_forum_with_xml
     content_type 'application/xml'
-    get :show, :id => 1, :format => 'xml'
+    get :show, :id => forums(:rails).id, :format => 'xml'
     assert_response :success
     assert_select 'forum'
   end
   
   def test_should_get_edit
     login_as :admin
-    get :edit, :id => 1
+    get :edit, :id => forums(:rails).id
     assert_response :success
   end
   
   def test_should_update_forum
     login_as :admin
-    put :update, :id => 1, :forum => { }, :tag_list => 'tagX, tagY'
+    patch :update, :id => forums(:rails).id, :forum => { }, :tag_list => 'tagX, tagY'
     assert_redirected_to forums_path
   
     assert_equal ['tagX', 'tagY'], Forum.find(1).tag_list
@@ -72,14 +72,14 @@ class ForumsControllerTest < ActionController::TestCase
   # def test_should_update_forum_with_xml
   #   authorize_as :aaron
   #   content_type 'application/xml'
-  #   put :update, :id => 1, :forum => { }, :format => 'xml'
+  #   patch :update, :id => forums(:rails).id, :forum => { }, :format => 'xml'
   #   assert_response :success
   # end
   
   def test_should_destroy_forum
     login_as :admin
     assert_difference Forum, :count, -1 do
-      delete :destroy, :id => 1
+      delete :destroy, :id => forums(:rails).id
     end
     
     assert_redirected_to forums_path
@@ -88,8 +88,8 @@ class ForumsControllerTest < ActionController::TestCase
   def test_should_destroy_forum_with_xml
     authorize_as :admin
     assert_difference Forum, :count, -1 do
-      delete :destroy, :id => 1, :format => 'xml'
-      assert_response :success      
+      delete :destroy, :id => forums(:rails).id, :format => 'xml'
+      assert_response :success
     end
   end
   

data/test/functional/friendships_controller_test.rb

@@ -4,11 +4,6 @@ class FriendshipsControllerTest < ActionController::TestCase
   include UsersHelper
   fixtures :friendships, :friendship_statuses, :users, :roles
 
-  test "should get index" do
-    get :index
-    assert_response :success
-  end
-
   def test_should_get_accepted_friends_list
     login_as :quentin
     get :accepted, :user_id => users(:quentin).id
@@ -27,7 +22,7 @@ class FriendshipsControllerTest < ActionController::TestCase
     login_as :quentin
     assert_difference Friendship, :count, 2 do
       assert_difference ActionMailer::Base.deliveries, :length, 1 do
-        post :create, :user_id => users(:quentin).id, :friend_id => users(:kevin).id 
+        post :create, :user_id => users(:quentin).id, :friend_id => users(:kevin).id
       end
     end
     assert_redirected_to accepted_user_friendships_path(users(:quentin))
@@ -39,7 +34,7 @@ class FriendshipsControllerTest < ActionController::TestCase
     login_as :quentin
     assert_difference Friendship, :count, 2 do
       assert_no_difference ActionMailer::Base.deliveries, :length do
-        post :create, :user_id => users(:quentin).id, :friend_id => users(:kevin).id 
+        post :create, :user_id => users(:quentin).id, :friend_id => users(:kevin).id
       end
     end
     assert_redirected_to accepted_user_friendships_path(users(:quentin))
@@ -53,46 +48,46 @@ class FriendshipsControllerTest < ActionController::TestCase
     end
     assert_redirected_to user_friendships_path(users(:quentin))
   end
-  
+
   def test_should_show_friendship
     login_as :quentin
     get :show, :id => friendships(:quentin_init_aaron_pending).id, :user_id => users(:quentin)
     assert_response :success
   end
-    
+
   def test_should_accept_friendship
     login_as :aaron
-    put :accept, :id => friendships(:aaron_receive_quentin_pending).id, :user_id => users(:aaron)
+    patch :accept, :id => friendships(:aaron_receive_quentin_pending).id, :user_id => users(:aaron)
     assert_redirected_to accepted_user_friendships_path(users(:aaron))
     assert_equal friendships(:aaron_receive_quentin_pending).reload.friendship_status_id, friendship_statuses(:accepted).id
   end
 
   def test_should_deny_friendship
     login_as :aaron
-    put :deny, :id => friendships(:aaron_receive_quentin_pending).id, :user_id => users(:aaron)
+    patch :deny, :id => friendships(:aaron_receive_quentin_pending).id, :user_id => users(:aaron)
     assert_redirected_to denied_user_friendships_path(users(:aaron))
     assert_equal friendships(:aaron_receive_quentin_pending).reload.friendship_status_id, friendship_statuses(:denied).id
   end
-  
+
   def test_should_destroy_friendship
     login_as :quentin
     assert_difference Friendship, :count, -2 do
-      delete :destroy, :id => 1, :user_id => users(:quentin).id
+      delete :destroy, :id => friendships(:quentin_init_aaron_pending).id, :user_id => users(:quentin).id
       assert_redirected_to accepted_user_friendships_path(:user_id => users(:quentin))
     end
   end
-  
+
   def test_should_ask_if_friends_and_return_false
     assert_nil friends?(users(:quentin), users(:aaron))
   end
-  
+
   def test_should_ask_if_friends_and_return_true
     friendships(:quentin_init_aaron_pending).friendship_status_id = friendship_statuses(:accepted).id
     friendships(:quentin_init_aaron_pending).save!
     friendships(:aaron_receive_quentin_pending).friendship_status_id = friendship_statuses(:accepted).id
-    friendships(:aaron_receive_quentin_pending).save!    
+    friendships(:aaron_receive_quentin_pending).save!
     assert friends?(users(:quentin), users(:aaron))
   end
-  
-  
+
+
 end

data/test/functional/homepage_features_controller_test.rb

@@ -35,25 +35,25 @@ class HomepageFeaturesControllerTest < ActionController::TestCase
 
   def test_should_show_homepage_feature
     login_as :admin
-    get :show, :id => 1
+    get :show, :id => homepage_features(:community_tour).id
     assert_response :success
   end
 
   def test_should_get_edit
     login_as :admin
-    get :edit, :id => 1
+    get :edit, :id => homepage_features(:community_tour).id
     assert_response :success
   end
   
   def test_should_update_homepage_feature
     login_as :admin
-    put :update, :id => 1, :homepage_feature => {:url => 'changed_url.com' }
+    patch :update, :id => homepage_features(:community_tour).id, :homepage_feature => {:url => 'changed_url.com' }
     assert_redirected_to homepage_feature_path(assigns(:homepage_feature))
   end
 
   def test_should_fail_to_update_homepage_feature
     login_as :admin
-    put :update, :id => 1, :homepage_feature => { :url => nil }
+    patch :update, :id => homepage_features(:community_tour).id, :homepage_feature => { :url => nil }
     assert assigns(:homepage_feature).errors[:url]
     assert_response :success
   end
@@ -62,7 +62,7 @@ class HomepageFeaturesControllerTest < ActionController::TestCase
   def test_should_destroy_homepage_feature
     login_as :admin
     assert_difference HomepageFeature, :count, -1 do
-      delete :destroy, :id => 1
+      delete :destroy, :id => homepage_features(:community_tour).id
     end
     assert_redirected_to homepage_features_path
   end

data/test/functional/messages_controller_test.rb

@@ -58,8 +58,12 @@ class MessagesControllerTest < ActionController::TestCase
     end
     assert_redirected_to  user_messages_path(users(:leopoldo))
   end
-  
-  
+
+  def test_should_autocomplete_username
+    get :auto_complete_for_username, :user_id => users(:leopoldo).id, :format => 'json'
+    assert_response :success
+  end
+
   def test_should_not_create_same_user_message
     assert_no_difference Message, :count do    
       post :create, :message => {:to => users(:leopoldo).login, :body => 'Some content',

data/test/functional/metro_areas_controller_test.rb

@@ -36,28 +36,28 @@ class MetroAreasControllerTest < ActionController::TestCase
 
   def test_should_show_metro_area
     login_as :admin
-    get :show, :id => 1
+    get :show, :id => metro_areas(:twincities).id
     assert_response :success
   end
 
   def test_should_get_edit
     login_as :admin
-    get :edit, :id => 1
+    get :edit, :id => metro_areas(:twincities).id
     assert_response :success
   end
   
   def test_should_update_metro_area
     login_as :admin
-    put :update, :id => 1, :metro_area => { }
+    patch :update, :id => metro_areas(:twincities).id, :metro_area => { }
     assert_redirected_to metro_area_path(assigns(:metro_area))
   end
   
   def test_should_destroy_metro_area
     login_as :admin
-    old_count = MetroArea.count
-    delete :destroy, :id => 1
-    assert_equal old_count-1, MetroArea.count
-    
+    assert_difference MetroArea, :count, -1 do
+      delete :destroy, :id => metro_areas(:twincities).id
+    end
+
     assert_redirected_to metro_areas_path
   end
 end

data/test/functional/moderators_controller_test.rb

@@ -8,7 +8,7 @@ class ModeratorsControllerTest < ActionController::TestCase
     assert users(:sam).moderator_of?(forums(:rails))
     login_as :admin
     assert_difference Moderatorship, :count, -1 do
-      delete :destroy, :forum_id => forums(:rails).id, :id => moderatorships(:sam_rails).id
+      delete :destroy, :forum_id => forums(:rails).id, :id => moderatorships(:sam_rails).id, :format => :js
     end
     assert !users(:sam).moderator_of?(forums(:rails))
   end