From 1911ea89140467de531ff2784016db14a600684e Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 25 May 2017 09:52:37 +0100 Subject: [PATCH] Refactor user_changeset_comments integration test to use factories. --- test/integration/user_changeset_comments_test.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/integration/user_changeset_comments_test.rb b/test/integration/user_changeset_comments_test.rb index 5dbcaa0b4..bedb1c69f 100644 --- 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" -- 2.43.2