Don't send note comment notifications to deleted users

[rails.git] / test / integration / user_diaries_test.rb

diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index fab05894fe924a6b55f48629c6bec2d0fa291339..a0b084f923bb84588b1dc0db5c75d1c4c5279f8b 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -1,19 +1,19 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require "test_helper"

 
 

-class UserDiariesTest < ActionController::IntegrationTest
+class UserDiariesTest < ActionDispatch::IntegrationTest

   fixtures :users, :diary_entries
 
   fixtures :users, :diary_entries
 

-  # Test the creation of a diary entry, making sure that you are redirected to 
+  # Test the creation of a diary entry, making sure that you are redirected to

   # login page when not logged in
   def test_showing_create_diary_entry
   # login page when not logged in
   def test_showing_create_diary_entry

-    get_via_redirect '/diary/new'
+    get_via_redirect "/diary/new"

     # We should now be at the login page
     assert_response :success
     # We should now be at the login page
     assert_response :success

-    assert_template 'user/login'
+    assert_template "user/login"

     # We can now login
     # We can now login

-    post  '/login', {'username' => "test@openstreetmap.org", 'password' => "test", :referer => '/diary/new'}
+    post "/login", "username" => "test@openstreetmap.org", "password" => "test", :referer => "/diary/new"

     assert_response :redirect
     assert_response :redirect

-    #print @response.body
+    # print @response.body

     # Check that there is some payload alerting the user to the redirect
     # and allowing them to get to the page they are being directed to
     assert_select "html:root" do
     # Check that there is some payload alerting the user to the redirect
     # and allowing them to get to the page they are being directed to
     assert_select "html:root" do


@@ -25,28 +25,24 @@ class UserDiariesTest < ActionController::IntegrationTest
     # http://markmail.org/message/wnslvi5xv5moqg7g
     @html_document = nil
     follow_redirect!
     # http://markmail.org/message/wnslvi5xv5moqg7g
     @html_document = nil
     follow_redirect!

-    
+

     assert_response :success
     assert_response :success

-    assert_template 'diary_entry/edit'
-    #print @response.body
-    #print @html_document.to_yaml
+    assert_template "diary_entry/edit"
+    # print @response.body
+    # print @html_document.to_yaml

 
 

-    # We will make sure that the form exists here, full 
+    # We will make sure that the form exists here, full

     # assert testing of the full form should be done in the
     # functional tests rather than this integration test
     # There are some things that are specific to the integratio
     # that need to be tested, which can't be tested in the functional tests
     # assert testing of the full form should be done in the
     # functional tests rather than this integration test
     # There are some things that are specific to the integratio
     # that need to be tested, which can't be tested in the functional tests

-    assert_select "html:root" do
-      assert_select "body" do
-        assert_select "div#content" do
-          assert_select "h1", "New Diary Entry" 
-          assert_select "form[action='/diary/new']" do
-            assert_select "input[id=diary_entry_title]"
-          end
-        end
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h1", "New Diary Entry"
+    end
+    assert_select "div#content" do
+      assert_select "form[action='/diary/new']" do
+        assert_select "input[id=diary_entry_title]"

       end
     end
       end
     end

-    
-    

   end
 end
   end
 end