last minor fixes

[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 91131ee8d0a3f0c853e1e2e2f4e18fcc9c799add..6ebf4ec0912fef585f6e733915cd0c9bb8c7b994 100644 (file)
--- a/test/controllers/diary_entry_controller_test.rb
+++ b/test/controllers/diary_entry_controller_test.rb
@@ -330,7 +330,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       assert_select "h2", :text => "No entry with the id: 9999", :count => 1
     end
 
       assert_select "h2", :text => "No entry with the id: 9999", :count => 1
     end
 

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

 
     # Now try an invalid comment with an empty body
     assert_no_difference "ActionMailer::Base.deliveries.size" do
 
     # Now try an invalid comment with an empty body
     assert_no_difference "ActionMailer::Base.deliveries.size" do


@@ -378,7 +378,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   def test_comment_spammy
     # Find the entry to comment on
     entry = create(:diary_entry, :user_id => users(:normal_user).id)
   def test_comment_spammy
     # Find the entry to comment on
     entry = create(:diary_entry, :user_id => users(:normal_user).id)

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

 
     # Generate some spammy content
     spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ")
 
     # Generate some spammy content
     spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ")


@@ -662,55 +662,45 @@ 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)
 

-    #basic_authorization(users(:public_user).email, "test")
-

     assert_difference "diary_entry.subscribers.count", 1 do
     assert_difference "diary_entry.subscribers.count", 1 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
     assert_response :redirect
   end
 
     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
 
     # bad diary id
       post :subscribe, :id => diary_entry.id, :display_name => diary_entry.user.display_name
     end
     assert_response :forbidden
 
     # bad diary id

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

     assert_response :not_found
 
     # trying to subscribe when already subscribed
     assert_response :not_found
 
     # trying to subscribe when already subscribed

-    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 }

     assert_no_difference "diary_entry.subscribers.count" do
     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)
 

-    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 }

     assert_difference "diary_entry.subscribers.count", -1 do
     assert_difference "diary_entry.subscribers.count", -1 do

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

     end
     assert_response :redirect
   end
 
     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)
 


@@ -721,12 +711,12 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_response :forbidden
 
     # bad diary id
     assert_response :forbidden
 
     # bad diary id

-    post :unsubscribe, {:id => 999111, :display_name => "username"}, { :user => users(:public_user).id}
+    post :unsubscribe, { :id => 999111, :display_name => "username" }, { :user => users(:public_user).id }

     assert_response :not_found
 
     assert_response :not_found
 

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

     assert_no_difference "diary_entry.subscribers.count" do
     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}
+      post :unsubscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }

     end
   end
 
     end
   end