X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3244635aa11878135a014cf2c9ec9177f8e9d0ba..1da4cecaf6f8bdae527553e61165cc41fc07533b:/test/functional/diary_entry_controller_test.rb?ds=sidebyside

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 1f3492ae9..3a402b602 100644
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -1,12 +1,14 @@
 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
 
   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})
@@ -14,7 +16,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     #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
@@ -23,7 +25,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
@@ -50,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
-    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 
@@ -62,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
-    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
@@ -76,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", :count => 4
+            assert_select "input", :count => 5
           end
         end
       end
@@ -99,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'
-    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
@@ -110,8 +112,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
           # This next line won't work if the text has been run through the htmlize function
           # due to formatting that could be introduced
           assert_select "p", :text => /#{new_body}/, :count => 1
-          assert_select "span.latitude", :text => new_latitude, :count => 1
-          assert_select "span.longitude", :text => new_longitude, :count => 1
+          assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1
           # As we're not logged in, check that you cannot edit
           #print @response.body
           assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 1
@@ -123,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'
-    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
@@ -134,10 +135,11 @@ class DiaryEntryControllerTest < ActionController::TestCase
           # This next line won't work if the text has been run through the htmlize function
           # due to formatting that could be introduced
           assert_select "p", :text => /#{new_body}/, :count => 1
-          assert_select "span.latitude", :text => new_latitude, :count => 1
-          assert_select "span.longitude", :text => new_longitude, :count => 1
+          assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1
           # As we're not logged in, check that you cannot edit
-          assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 0
+          assert_select "span[class=hidden show_if_user_#{users(:normal_user).id}]", :count => 1 do
+            assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 1
+          end
         end
       end
     end
@@ -175,9 +177,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_rss
-    get :rss
+    get :rss, {:format => :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
@@ -187,30 +189,30 @@ class DiaryEntryControllerTest < ActionController::TestCase
   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
-#    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
-    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
-    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
-    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