Pass on routing failures from MapQuest

[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 23687fa8e948646e2195a8af34a0019bc98ad1eb..278a68e7b0f904120b18c7d6b7012ea8be4067b2 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 
@@ -36,21 +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
-    assert_select "html:root" do
-      assert_select "body" do
-        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
+    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