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

[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 5dbcaa0b413bea1ce52f5a94a10dfef7cc8c5162..2953f5fe2a98661653384fffb4c362f69033337d 100644 (file)
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -1,18 +1,20 @@
 require "test_helper"
 
 class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
-  fixtures :users, :changesets
-
   # Test 'log in to comment' message for nonlogged in user
   def test_log_in_message
-    get "/changeset/#{changesets(:normal_user_closed_change).id}"
+    changeset = create(:changeset, :closed)
+
+    get "/changeset/#{changeset.id}"
     assert_response :success
 
     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.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
@@ -21,15 +23,19 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
 
   # Test if the form is shown
   def test_displaying_form
-    get_via_redirect "/login"
+    user = create(:user)
+    changeset = create(:changeset, :closed)
+
+    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" => "test@openstreetmap.org", "password" => "test"
+    post "/login", :params => { "username" => user.email, "password" => "test" }
     assert_response :redirect
 
-    get "/changeset/#{changesets(:normal_user_closed_change).id}"
+    get "/changeset/#{changeset.id}"
 
     assert_response :success
     assert_template "browse/changeset"