X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f70feedc6517b824c4201584d6298fd5790d85ba..b3f8d9435a30f43b969bb8e3bfcc2386ef0aa4a7:/test/integration/user_diaries_test.rb diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb index fab05894f..7188afd7a 100644 --- a/test/integration/user_diaries_test.rb +++ b/test/integration/user_diaries_test.rb @@ -1,52 +1,36 @@ -require File.dirname(__FILE__) + '/../test_helper' +require "test_helper" -class UserDiariesTest < ActionController::IntegrationTest - fixtures :users, :diary_entries - - # Test the creation of a diary entry, making sure that you are redirected to +class UserDiariesTest < ActionDispatch::IntegrationTest + # 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 '/diary/new' + user = create(:user) + + get "/diary/new" + follow_redirect! + follow_redirect! # We should now be at the login page assert_response :success - assert_template 'user/login' + assert_template "sessions/new" # We can now login - post '/login', {'username' => "test@openstreetmap.org", 'password' => "test", :referer => '/diary/new'} + post "/login", :params => { "username" => user.email, "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/diary/new']" - end - end - # Required due to a bug in the rails testing framework - # http://markmail.org/message/wnslvi5xv5moqg7g - @html_document = nil follow_redirect! - assert_response :success - assert_template 'diary_entry/edit' - #print @response.body - #print @html_document.to_yaml + assert_template "diary_entries/new" - # We will make sure that the form exists here, full + # 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[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']" do + assert_select "input[id=diary_entry_title]" end end - - end end