X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a3eb48385bcf1465339d473c0c1657e075cd507d..c1cdddf11f363d24f7c18b3e9df15e1bde3c4302:/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 c984149db..603030469 100644
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -1,13 +1,13 @@
-require 'test_helper'
+require "test_helper"
 
 class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
-  fixtures :users, :changesets, :changeset_comments
-
   # 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
@@ -21,18 +21,22 @@ 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 "user/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'
+    assert_template "browse/changeset"
 
     assert_select "div#content" do
       assert_select "div#sidebar" do