X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/44629832dd0207d7b0f50b93f1d00b4373dd4d49..68a3df4d53c84508bf443058040379c3a18eb1a7:/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 8725def3d..92d9bcffd 100644
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -96,30 +96,21 @@ class DiaryEntryControllerTest < ActionController::TestCase
     #print @response.body
     
     #print @response.to_yaml
-    assert_select "html", :count => 1 do
-      assert_select "head", :count => 1 do
-        assert_select "title", :text => /New Diary Entry/, :count => 1
-      end
-      assert_select "body", :count => 1 do
-        assert_select "div.wrapper", :count => 1 do
-          assert_select "div.content-heading", :count => 1 do
-            assert_select "h1", :text => "New Diary Entry", :count => 1
-          end
-          assert_select "div#content", :count => 1 do
-            # We don't care about the layout, we just care about the form fields
-            # that are available
-            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
-              assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1
-              assert_select "input[name=commit][type=submit][value=Save]", :count => 1
-            end
-          end
-        end
+    assert_select "title", :text => /New Diary Entry/, :count => 1
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h1", :text => "New Diary Entry", :count => 1
+    end
+    assert_select "div#content", :count => 1 do
+      # We don't care about the layout, we just care about the form fields
+      # that are available
+      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
+        assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1
+        assert_select "input[name=commit][type=submit][value=Save]", :count => 1
       end
     end
-        
   end
   
   def test_editing_diary_entry
@@ -134,46 +125,32 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Verify that you get a not found error, when you pass a bogus id
     get(:edit, {:display_name => entry.user.display_name, :id => 9999}, {'user' => entry.user.id})
     assert_response :not_found
-    assert_select "html", :count => 1 do
-      assert_select "body", :count => 1 do
-        assert_select "div.wrapper", :count => 1 do
-          assert_select "div.content-heading", :count => 1 do
-            assert_select "h2", :text => "No entry with the id: 9999", :count => 1 
-          end
-        end
-      end
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h2", :text => "No entry with the id: 9999", :count => 1
     end
-    
+
     # Now pass the id, and check that you can edit it, when using the same 
     # user as the person who created the entry
     get(:edit, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id})
     assert_response :success
-    assert_select "html", :count => 1 do
-      assert_select "head", :count => 1 do
-        assert_select "title", :text => /Edit diary entry/, :count => 1
-      end
-      assert_select "body", :count => 1 do
-        assert_select "div.wrapper", :count => 1 do
-          assert_select "div.content-heading", :count => 1 do
-            assert_select "h1", :text => /Edit diary entry/, :count => 1
-          end
-          assert_select "div#content", :count => 1 do 
-            assert_select "form[action='/user/#{entry.user.display_name}/diary/#{entry.id}/edit'][method=post]", :count => 1 do
-              assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1
-              assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1
-              assert_select "select#diary_entry_language_code", :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[name=commit][type=submit][value=Edit]", :count => 1
-              assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
-              assert_select "input", :count => 7
-            end
-          end
-        end
+    assert_select "title", :text => /Edit diary entry/, :count => 1
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h1", :text => /Edit diary entry/, :count => 1
+    end
+    assert_select "div#content", :count => 1 do
+      assert_select "form[action='/user/#{entry.user.display_name}/diary/#{entry.id}/edit'][method=post]", :count => 1 do
+        assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1
+        assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1
+        assert_select "select#diary_entry_language_code", :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[name=commit][type=submit][value=Edit]", :count => 1
+        assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
+        assert_select "input", :count => 7
       end
     end
-    
+
     # Now lets see if you can edit the diary entry
     new_title = "New Title"
     new_body = "This is a new body for the diary entry"
@@ -191,58 +168,40 @@ class DiaryEntryControllerTest < ActionController::TestCase
     get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}
     assert_response :success
     assert_template 'diary_entry/view'
-    assert_select "html", :count => 1 do
-      assert_select "head", :count => 1 do
-        assert_select "title", :text => /Users' diaries | /, :count => 1
-      end
-      assert_select "body", :count => 1 do
-        assert_select "div.wrapper", :count => 1 do
-          assert_select "div.content-heading", :count => 1 do
-            assert_select "h2", :text => /#{entry.user.display_name}&#39;s diary/, :count => 1
-          end
-          assert_select "div#content", :count => 1 do
-            assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
-            # 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 "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/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
-          end
-        end
-      end
+    assert_select "title", :text => /Users' diaries | /, :count => 1
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h2", :text => /#{entry.user.display_name}&#39;s diary/, :count => 1
+    end
+    assert_select "div#content", :count => 1 do
+      assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+      # 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 "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/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
     end
 
     # and when not logged in as the user who wrote the entry
     get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}
     assert_response :success
     assert_template 'diary_entry/view'
-    assert_select "html", :count => 1 do
-      assert_select "head", :count => 1 do
-        assert_select "title", :text => /Users' diaries | /, :count => 1
-      end
-      assert_select "body", :count => 1 do
-        assert_select "div.wrapper", :count => 1 do
-          assert_select "div.content-heading", :count => 1 do
-            assert_select "h2", :text => /#{users(:normal_user).display_name}&#39;s diary/, :count => 1
-          end
-          assert_select "div#content", :count => 1 do
-            assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
-            # 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 "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 "li[class=hidden show_if_user_#{entry.user.id}]", :count => 1 do
-              assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
-            end
-          end
-        end
+    assert_select "title", :text => /Users' diaries | /, :count => 1
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h2", :text => /#{users(:normal_user).display_name}&#39;s diary/, :count => 1
+    end
+    assert_select "div#content", :count => 1 do
+      assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+      # 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 "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 "li[class=hidden show_if_user_#{entry.user.id}]", :count => 1 do
+        assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
       end
     end
-    #print @response.body
-    
   end
   
   def test_edit_diary_entry_i18n
@@ -261,29 +220,21 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Now try again when logged in
     get :new, {}, {:user => users(:normal_user).id}
     assert_response :success
-    assert_select "html", :count => 1 do
-      assert_select "head", :count => 1 do
-        assert_select "title", :text => /New Diary Entry/, :count => 1
-      end
-      assert_select "body", :count => 1 do
-        assert_select "div.wrapper", :count => 1 do
-          assert_select "div.content-heading", :count => 1 do
-            assert_select "h1", :text => /New Diary Entry/, :count => 1
-          end
-          assert_select "div#content", :count => 1 do 
-            assert_select "form[action='/diary/new'][method=post]", :count => 1 do
-              assert_select "input#diary_entry_title[name='diary_entry[title]']", :count => 1
-              assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => "", :count => 1
-              assert_select "select#diary_entry_language_code", :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[name=commit][type=submit][value=Edit]", :count => 1
-              assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
-              assert_select "input", :count => 7
-            end
-          end
-        end
+    assert_select "title", :text => /New Diary Entry/, :count => 1
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h1", :text => /New Diary Entry/, :count => 1
+    end
+    assert_select "div#content", :count => 1 do
+      assert_select "form[action='/diary/new'][method=post]", :count => 1 do
+        assert_select "input#diary_entry_title[name='diary_entry[title]']", :count => 1
+        assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => "", :count => 1
+        assert_select "select#diary_entry_language_code", :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[name=commit][type=submit][value=Edit]", :count => 1
+        assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
+        assert_select "input", :count => 7
       end
     end
 
@@ -320,14 +271,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Verify that you get a not found error, when you pass a bogus id
     post :comment, {:display_name => entry.user.display_name, :id => 9999}, {:user => users(:public_user).id}
     assert_response :not_found
-    assert_select "html", :count => 1 do
-      assert_select "body", :count => 1 do
-        assert_select "div.wrapper", :count => 1 do
-          assert_select "div.content-heading", :count => 1 do
-            assert_select "h2", :text => "No entry with the id: 9999", :count => 1 
-          end
-        end
-      end
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h2", :text => "No entry with the id: 9999", :count => 1
     end
 
     # Now try again with the right id