X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/07673278f13c87fd2e073b041970bbdd45eebe86..d02b8d9f1ed9b99651cdffae69b8c70e533d5517:/test/integration/user_changeset_comments_test.rb diff --git a/test/integration/user_changeset_comments_test.rb b/test/integration/user_changeset_comments_test.rb index 3667db5ca..a9bd468ce 100644 --- a/test/integration/user_changeset_comments_test.rb +++ b/test/integration/user_changeset_comments_test.rb @@ -11,8 +11,10 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest assert_select "div#content" do assert_select "div#sidebar" do assert_select "div#sidebar_content" do - assert_select "div.browse-section" do - assert_select "div.notice.hide_if_logged_in" + assert_select "div" do + assert_select "div.notice" do + assert_select "a[href='/login?referer=%2Fchangeset%2F#{changeset.id}']", :text => I18n.t("browse.changeset.join_discussion"), :count => 1 + end end end end @@ -28,9 +30,9 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest 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" => user.email, "password" => "test" + post "/login", :params => { "username" => user.email, "password" => "test" } assert_response :redirect get "/changeset/#{changeset.id}" @@ -41,7 +43,7 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest assert_select "div#content" do assert_select "div#sidebar" do assert_select "div#sidebar_content" do - assert_select "div.browse-section" do + assert_select "div" do assert_select "form[action='#']" do assert_select "textarea[name=text]" end