X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/11aff90f63d79406e9efa1343c965a19dcf5dbba..821a22c6073d4b50ae7038e9c1aacbb5e68cd55a:/test/integration/user_diaries_test.rb diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb index fab05894f..58e70bfd2 100644 --- a/test/integration/user_diaries_test.rb +++ b/test/integration/user_diaries_test.rb @@ -1,6 +1,6 @@ -require File.dirname(__FILE__) + '/../test_helper' +require '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,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 - 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