mirror of
https://github.com/discourse/discourse.git
synced 2024-11-26 18:43:37 +08:00
5140ec9acf
- IgnoredUser records should all now have an expiring_at value. This commit enforces that in the DB, and fixes any corrupt rows
- Changes to the ignored user list are now handled by the `/u/{username}/notification_level` endpoint. This allows setting expiration dates on the ignore. This commit removes the old logic for saving a list of usernames in the user preferences.
- Many specs were calling `IgnoredUser.create`. This commit changes them to use `Fabricate(:ignored_user)` for consistency
44 lines
1.2 KiB
Ruby
44 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe Jobs::PurgeExpiredIgnoredUsers do
|
|
subject { Jobs::PurgeExpiredIgnoredUsers.new.execute({}) }
|
|
|
|
context "with no ignored users" do
|
|
it "does nothing" do
|
|
expect { subject }.to_not change { IgnoredUser.count }
|
|
end
|
|
end
|
|
|
|
context "when some ignored users exist" do
|
|
fab!(:tarek) { Fabricate(:user, username: "tarek") }
|
|
fab!(:matt) { Fabricate(:user, username: "matt") }
|
|
fab!(:john) { Fabricate(:user, username: "john") }
|
|
|
|
before do
|
|
Fabricate(:ignored_user, user: tarek, ignored_user: matt)
|
|
Fabricate(:ignored_user, user: tarek, ignored_user: john)
|
|
end
|
|
|
|
context "when no expired ignored users" do
|
|
it "does nothing" do
|
|
expect { subject }.to_not change { IgnoredUser.count }
|
|
end
|
|
end
|
|
|
|
context "when there are expired ignored users by expiring_at" do
|
|
fab!(:fred) { Fabricate(:user, username: "fred") }
|
|
|
|
it "purges expired ignored users" do
|
|
Fabricate(:ignored_user, user: tarek, ignored_user: fred, expiring_at: 1.month.from_now)
|
|
|
|
freeze_time(2.months.from_now) do
|
|
subject
|
|
expect(IgnoredUser.find_by(ignored_user: fred)).to be_nil
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|