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

[rails.git] / test / helpers / changeset_helper_test.rb

diff --git a/test/helpers/changeset_helper_test.rb b/test/helpers/changeset_helper_test.rb
index 3fa5d266da465288978a573f1165efa1fc7a8f3b..d932138f8ad2900dc899cb2cf6fbce00acf54958 100644 (file)
--- a/test/helpers/changeset_helper_test.rb
+++ b/test/helpers/changeset_helper_test.rb
@@ -1,15 +1,27 @@
-require 'test_helper'
+require "test_helper"
 
 class ChangesetHelperTest < ActionView::TestCase
-  fixtures :changesets, :users
-
   def test_changeset_user_link
-    assert_equal "<a href=\"/user/test2\">test2</a>", changeset_user_link(changesets(:public_user_first_change))
-    assert_equal "anonymous", changeset_user_link(changesets(:normal_user_first_change))
+    changeset = create(:changeset)
+    assert_equal %(<a href="/user/#{ERB::Util.u(changeset.user.display_name)}">#{changeset.user.display_name}</a>), changeset_user_link(changeset)
+
+    changeset = create(:changeset, :user => create(:user, :data_public => false))
+    assert_equal "anonymous", changeset_user_link(changeset)
+
+    changeset = create(:changeset, :user => create(:user, :deleted))
+    assert_equal "deleted", changeset_user_link(changeset)
   end
 
   def test_changeset_details
-    assert_match /^Created <abbr title='Mon, 01 Jan 2007 00:00:00 \+0000'>.*<\/abbr> by anonymous$/, changeset_details(changesets(:normal_user_first_change))
-    assert_match /^Closed <abbr title='Created: Mon, 01 Jan 2007 00:00:00 \+0000&#10;Closed: Tue, 02 Jan 2007 00:00:00 \+0000'>.*<\/abbr> by <a href="\/user\/test2">test2<\/a>$/, changeset_details(changesets(:public_user_closed_change))
+    changeset = create(:changeset, :created_at => Time.utc(2007, 1, 1, 0, 0, 0), :user => create(:user, :data_public => false))
+    # We need to explicitly reset the closed_at to some point in the future, and avoid the before_save callback
+    changeset.update_column(:closed_at, Time.now.utc + 1.day) # rubocop:disable Rails/SkipsModelValidations
+
+    assert_match %r{^Created <abbr title='Mon, 01 Jan 2007 00:00:00 \+0000'>.*</abbr> by anonymous$}, changeset_details(changeset)
+
+    changeset = create(:changeset, :created_at => Time.utc(2007, 1, 1, 0, 0, 0), :closed_at => Time.utc(2007, 1, 2, 0, 0, 0))
+    user_link = %(<a href="/user/#{ERB::Util.u(changeset.user.display_name)}">#{changeset.user.display_name}</a>)
+
+    assert_match %r{^Closed <abbr title='Created: Mon, 01 Jan 2007 00:00:00 \+0000&#10;Closed: Tue, 02 Jan 2007 00:00:00 \+0000'>.*</abbr> by #{user_link}$}, changeset_details(changeset)
   end
 end