List all objects that are blocking a delete, in a well defined order

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

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 38c7bddcd50b89571de01e6745d2b67a0306a500..3a402b602a52cd0289be9c88acd22cf9b56d84b6 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class DiaryEntryControllerTest < ActionController::TestCase
 require File.dirname(__FILE__) + '/../test_helper'
 
 class DiaryEntryControllerTest < ActionController::TestCase

-  fixtures :users, :diary_entries, :diary_comments
+  fixtures :users, :diary_entries, :diary_comments, :languages

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


@@ -16,7 +16,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     #print @response.body
     
     #print @response.to_yaml
     #print @response.body
     
     #print @response.to_yaml

-    assert_select "html:root", :count => 1 do
+    assert_select "html", :count => 1 do

       assert_select "head", :count => 1 do
         assert_select "title", :text => /New Diary Entry/, :count => 1
       end
       assert_select "head", :count => 1 do
         assert_select "title", :text => /New Diary Entry/, :count => 1
       end


@@ -52,7 +52,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Verify that you get a not found error, when you don't pass an id
     get(:edit, nil, {'user' => users(:normal_user).id})
     assert_response :not_found
     # Verify that you get a not found error, when you don't pass an id
     get(:edit, nil, {'user' => users(:normal_user).id})
     assert_response :not_found

-    assert_select "html:root", :count => 1 do
+    assert_select "html", :count => 1 do

       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
           assert_select "h2", :text => "No entry with the id:", :count => 1 
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
           assert_select "h2", :text => "No entry with the id:", :count => 1 


@@ -64,7 +64,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # user as the person who created the entry
     get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
     assert_response :success
     # user as the person who created the entry
     get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
     assert_response :success

-    assert_select "html:root", :count => 1 do
+    assert_select "html", :count => 1 do

       assert_select "head", :count => 1 do
         assert_select "title", :text => /Edit diary entry/, :count => 1
       end
       assert_select "head", :count => 1 do
         assert_select "title", :text => /Edit diary entry/, :count => 1
       end


@@ -78,7 +78,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
             assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
             assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
             assert_select "input[name=commit][type=submit][value=Save]", :count => 1
             assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
             assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
             assert_select "input[name=commit][type=submit][value=Save]", :count => 1

-            assert_select "input", :count => 4
+            assert_select "input", :count => 5

           end
         end
       end
           end
         end
       end


@@ -101,7 +101,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:normal_user).id}
     assert_response :success
     assert_template 'diary_entry/view'
     get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:normal_user).id}
     assert_response :success
     assert_template 'diary_entry/view'

-    assert_select "html:root", :count => 1 do
+    assert_select "html", :count => 1 do

       assert_select "head", :count => 1 do
         assert_select "title", :text => /Users' diaries | /, :count => 1
       end
       assert_select "head", :count => 1 do
         assert_select "title", :text => /Users' diaries | /, :count => 1
       end


@@ -124,7 +124,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:public_user).id}
     assert_response :success
     assert_template 'diary_entry/view'
     get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:public_user).id}
     assert_response :success
     assert_template 'diary_entry/view'

-    assert_select "html:root", :count => 1 do
+    assert_select "html", :count => 1 do

       assert_select "head", :count => 1 do
         assert_select "title", :text => /Users' diaries | /, :count => 1
       end
       assert_select "head", :count => 1 do
         assert_select "title", :text => /Users' diaries | /, :count => 1
       end


@@ -177,9 +177,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_rss
   end
   
   def test_rss

-    get :rss
+    get :rss, {:format => :rss}

     assert_response :success, "Should be able to get a diary RSS"
     assert_response :success, "Should be able to get a diary RSS"

-    assert_select "rss:root", :count => 1 do
+    assert_select "rss", :count => 1 do

       assert_select "channel", :count => 1 do
         assert_select "channel>title", :count => 1
         assert_select "image", :count => 1
       assert_select "channel", :count => 1 do
         assert_select "channel>title", :count => 1
         assert_select "image", :count => 1


@@ -189,30 +189,30 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_rss_language
   end
   
   def test_rss_language

-    get :rss, {:language => diary_entries(:normal_user_entry_1).language_code}
+    get :rss, {:language => diary_entries(:normal_user_entry_1).language_code, :format => :rss}

     assert_response :success, "Should be able to get a specific language diary RSS"
     assert_select "rss>channel>item", :count => 1 #, "Diary entries should be filtered by language"
   end
   
 #  def test_rss_nonexisting_language
     assert_response :success, "Should be able to get a specific language diary RSS"
     assert_select "rss>channel>item", :count => 1 #, "Diary entries should be filtered by language"
   end
   
 #  def test_rss_nonexisting_language

-#    get :rss, {:language => 'xx'}
+#    get :rss, {:language => 'xx', :format => :rss}

 #    assert_response :not_found, "Should not be able to get a nonexisting language diary RSS"
 #  end
 
   def test_rss_language_with_no_entries
 #    assert_response :not_found, "Should not be able to get a nonexisting language diary RSS"
 #  end
 
   def test_rss_language_with_no_entries

-    get :rss, {:language => 'sl'}
+    get :rss, {:language => 'sl', :format => :rss}

     assert_response :success, "Should be able to get a specific language diary RSS"
     assert_select "rss>channel>item", :count => 0 #, "Diary entries should be filtered by language"
   end
 
   def test_rss_user
     assert_response :success, "Should be able to get a specific language diary RSS"
     assert_select "rss>channel>item", :count => 0 #, "Diary entries should be filtered by language"
   end
 
   def test_rss_user

-    get :rss, {:display_name => users(:normal_user).display_name}
+    get :rss, {:display_name => users(:normal_user).display_name, :format => :rss}

     assert_response :success, "Should be able to get a specific users diary RSS"
     assert_select "rss>channel>item", :count => 2 #, "Diary entries should be filtered by user"
   end
   
   def test_rss_nonexisting_user
     assert_response :success, "Should be able to get a specific users diary RSS"
     assert_select "rss>channel>item", :count => 2 #, "Diary entries should be filtered by user"
   end
   
   def test_rss_nonexisting_user

-    get :rss, {:display_name => 'fakeUsername76543'}
+    get :rss, {:display_name => 'fakeUsername76543', :format => :rss}

     assert_response :not_found, "Should not be able to get a nonexisting users diary RSS"
   end
 
     assert_response :not_found, "Should not be able to get a nonexisting users diary RSS"
   end