Replace WordPress logo with correct version

[rails.git] / test / controllers / diary_entry_controller_test.rb

diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb
index 77d340ffe90c29ce0b28d8ba216ac3d5af1c09b4..d926f26569e1781ff12f96a9fb91ffdf9c83f8d4 100644 (file)
--- a/test/controllers/diary_entry_controller_test.rb
+++ b/test/controllers/diary_entry_controller_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 class DiaryEntryControllerTest < ActionController::TestCase
 require "test_helper"
 
 class DiaryEntryControllerTest < ActionController::TestCase

-  fixtures :users, :user_roles, :languages, :friends
+  fixtures :users, :user_roles, :languages

 
   include ActionView::Helpers::NumberHelper
 
 
   include ActionView::Helpers::NumberHelper
 


@@ -440,7 +440,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_list_friends
   end
 
   def test_list_friends

-    diary_entry = create(:diary_entry, :user_id => friends(:normal_user_with_second_user).friend_user_id)
+    friend = create(:friend, :user_id => users(:normal_user).id)
+    diary_entry = create(:diary_entry, :user_id => friend.friend_user_id)

     _other_entry = create(:diary_entry, :user_id => users(:second_public_user).id)
 
     # Try a list of diary entries for your friends when not logged in
     _other_entry = create(:diary_entry, :user_id => users(:second_public_user).id)
 
     # Try a list of diary entries for your friends when not logged in


@@ -662,8 +663,6 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_response :not_found
   end
 
     assert_response :not_found
   end
 

-  ##
-  # test subscribe success

   def test_subscribe_success
     diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
 
   def test_subscribe_success
     diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
 


@@ -673,13 +672,11 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_response :redirect
   end
 
     assert_response :redirect
   end
 

-  ##
-  # test subscribe fail

   def test_subscribe_fail
     diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
 
     # not signed in
   def test_subscribe_fail
     diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
 
     # not signed in

-    assert_no_difference "diary_entry.subscribers.count", 1 do
+    assert_no_difference "diary_entry.subscribers.count" do

       post :subscribe, :id => diary_entry.id, :display_name => diary_entry.user.display_name
     end
     assert_response :forbidden
       post :subscribe, :id => diary_entry.id, :display_name => diary_entry.user.display_name
     end
     assert_response :forbidden


@@ -691,12 +688,10 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # trying to subscribe when already subscribed
     post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
     assert_no_difference "diary_entry.subscribers.count" do
     # trying to subscribe when already subscribed
     post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
     assert_no_difference "diary_entry.subscribers.count" do

-      post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:public_user).id }
+      post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }

     end
   end
 
     end
   end
 

-  ##
-  # test unsubscribe success

   def test_unsubscribe_success
     diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
 
   def test_unsubscribe_success
     diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
 


@@ -707,8 +702,6 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_response :redirect
   end
 
     assert_response :redirect
   end
 

-  ##
-  # test unsubscribe fail

   def test_unsubscribe_fail
     diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
 
   def test_unsubscribe_fail
     diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
 


@@ -722,7 +715,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     post :unsubscribe, { :id => 999111, :display_name => "username" }, { :user => users(:public_user).id }
     assert_response :not_found
 
     post :unsubscribe, { :id => 999111, :display_name => "username" }, { :user => users(:public_user).id }
     assert_response :not_found
 

-    # trying to subscribe when already subscribed
+    # trying to unsubscribe when not subscribed

     assert_no_difference "diary_entry.subscribers.count" do
       post :unsubscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
     end
     assert_no_difference "diary_entry.subscribers.count" do
       post :unsubscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
     end