X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ceb6a86430343b379e09771d7f040c223adde69d..17a7c69e8dfefb5dda2a9f57d6ea3c879d4568f4:/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 709404045..53d9716b3 100644
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -6,7 +6,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   def test_showing_new_diary_entry
     get :new
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/new"
+    assert_redirected_to :controller => :user, :action => "login", :referer => "/diary/new"
     # Now pretend to login by using the session hash, with the 
     # id of the person we want to login as through session(:user)=user.id
     get(:new, nil, {'user' => users(:normal_user).id})
@@ -23,7 +23,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
           assert_select "h1", "New Diary Entry", :count => 1
           # We don't care about the layout, we just care about the form fields
           # that are available
-          assert_select "form[action='/diary_entry/new']", :count => 1 do
+          assert_select "form[action='/diary/new']", :count => 1 do
             assert_select "input[id=diary_entry_title][name='diary_entry[title]']", :count => 1
             assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :count => 1
             assert_select "input#latitude[name='diary_entry[latitude]'][type=text]", :count => 1
@@ -146,13 +146,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_edit_diary_entry_i18n
-    I18n.available_locales.each do |locale|
-      set_locale locale
-      
-      get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
-      assert_response :success
-      assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
-    end
+    get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
+    assert_response :success
+    assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
   end
   
   def test_create_diary_entry
@@ -166,27 +162,58 @@ class DiaryEntryControllerTest < ActionController::TestCase
   # Check that you can get the expected response and template for all available languages
   # Should test that there are no <span class="translation_missing">
   def test_listing_diary_entries
-    I18n.available_locales.each do |locale|
-      set_locale locale
-      
       get :list
-      assert_response :success, "Should be able to list the diary entries in #{locale}"
-      assert_template 'list', "Should use the list template in #{locale}"
+      assert_response :success, "Should be able to list the diary entries in locale"
+      assert_template 'list', "Should use the list template in locale"
       assert_select "span[class=translation_missing]", false, "Missing translation in list of diary entries"
     
       # Now try to find a specific user's diary entry
       get :list, {:display_name => users(:normal_user).display_name}
-      assert_response :success, "Should be able to list the diary entries for a user in #{locale}"
-      assert_template 'list', "Should use the list template for a user in #{locale}"
-      assert_select "span[class=translation_missing]", false, "Missing translation in list of diary entries for user"
-    end
+      assert_response :success, "Should be able to list the diary entries for a user in locale"
+      assert_template 'list', "Should use the list template for a user in locale"
+      assert_no_missing_translations
   end
   
   def test_rss
     get :rss
-    assert_response :success
+    assert_response :success, "Should be able to get a diary RSS"
+    assert_select "rss:root", :count => 1 do
+      assert_select "channel", :count => 1 do
+        assert_select "channel>title", :count => 1
+        assert_select "image", :count => 1
+        assert_select "channel>item", :count => 2
+      end
+    end
+  end
+  
+  def test_rss_language
+    get :rss, {:language => diary_entries(:normal_user_entry_1).language_code}
+    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'}
+#    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'}
+    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}
+    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'}
+    assert_response :not_found, "Should not be able to get a nonexisting users diary RSS"
+  end
+
   def test_viewing_diary_entry
     get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}
     assert_response :success