Do basic testing of all site controller methods

[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 98ea04543b0cbe510394c7b3f581aa2122f14792..278a68e7b0f904120b18c7d6b7012ea8be4067b2 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -1,24 +1,24 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 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
   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
     # 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_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
       end
     end
     # Required due to a bug in the rails testing framework


@@ -36,17 +36,13 @@ class UserDiariesTest < ActionController::IntegrationTest
     # 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
     # 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='/user/#{users(:normal_user).display_name}/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