X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/995c9df1958a9f2333748179fe276bc9886b8a86..5fc397935c5d24b8f5f798190325618bd9dba507:/test/integration/user_diaries_test.rb

diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index 02908e18d..79436a7db 100644
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -1,22 +1,24 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserDiariesTest < ActionController::IntegrationTest
+class UserDiariesTest < ActionDispatch::IntegrationTest
   fixtures :users, :diary_entries
 
+  # 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
-    get_via_redirect '/user/test/diary/new'
+    get_via_redirect '/diary/new'
     # We should now be at the login page
     assert_response :success
     assert_template 'user/login'
     # We can now login
-    post  '/login', {'user[email]' => "test@openstreetmap.org", 'user[password]' => "test", :referer => '/user/test/diary/new'}
+    post  '/login', {'username' => "test@openstreetmap.org", 'password' => "test", :referer => '/diary/new'}
     assert_response :redirect
     #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
       assert_select "body" do
-        assert_select "a[href='http://www.example.com/user/test/diary/new']"
+        assert_select "a[href='http://www.example.com/diary/new']"
       end
     end
     # Required due to a bug in the rails testing framework
@@ -29,15 +31,26 @@ class UserDiariesTest < ActionController::IntegrationTest
     #print @response.body
     #print @html_document.to_yaml
 
+    # 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_select "html:root" do
       assert_select "body" do
-        assert_select "div#content" do
-          assert_select "h1", "New diary entry" 
-          assert_select "form" do
-            assert_select "input[id=diary_entry_title]"
+        assert_select "div.wrapper", :count => 1 do
+          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