Fix routing of changeset feed

[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..79436a7db29d15a425e6a738bb4dfff8d4167f6f 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -1,6 +1,6 @@
 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 
@@ -38,10 +38,14 @@ class UserDiariesTest < ActionController::IntegrationTest
     # 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]"
+        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