Merge pull request #4193 from AntonKhorev/lookup-friend

[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..2b95094fec464587c4759737c633b9d7dd44fcd8 100644 (file)
--- 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 "p.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 "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}"
@@ -40,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