Merge remote-tracking branch 'openstreetmap/pull/1553'

[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..bedb1c69f39a398313d08a4c1fcb3eccc7249088 100644 (file)
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -1,11 +1,11 @@
 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
@@ -21,15 +21,18 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
 
   # Test if the form is shown
   def test_displaying_form
+    user = create(:user)
+    changeset = create(:changeset, :closed)
+
     get_via_redirect "/login"
     # We should now be at the login page
     assert_response :success
     assert_template "user/login"
     # We can now login
-    post "/login", "username" => "test@openstreetmap.org", "password" => "test"
+    post "/login", "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"