Merge remote-tracking branch 'upstream/pull/2462'

[rails.git] / 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 bedb1c69f39a398313d08a4c1fcb3eccc7249088..2953f5fe2a98661653384fffb4c362f69033337d 100644 (file)
--- 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}"