X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1911ea89140467de531ff2784016db14a600684e..5cc4e933479b7e74ed7d4425909f0915717fc1db:/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 bedb1c69f..2953f5fe2 100644 --- a/test/integration/user_changeset_comments_test.rb +++ b/test/integration/user_changeset_comments_test.rb @@ -12,7 +12,9 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest 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.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 @@ -24,12 +26,13 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest user = create(:user) changeset = create(:changeset, :closed) - get_via_redirect "/login" + get "/login" + follow_redirect! # We should now be at the login page assert_response :success - assert_template "user/login" + assert_template "users/login" # 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}"