X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/02eeefbe0ff7d5d60d6a7133942f5792d2aabb15..61c32388a9d9543ce0b3144fdfac22c73c9efe7f:/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 5dbcaa0b4..a1f08ae6d 100644
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -1,35 +1,21 @@
 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}"
-    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"
-          end
-        end
-      end
-    end
-  end
-
   # 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 "sessions/new"
     # 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"
@@ -37,7 +23,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