mirror of
https://github.com/discourse/discourse.git
synced 2025-02-19 07:22:45 +08:00
ad3ec5809f
Original PR was reverted because of broken migration https://github.com/discourse/discourse/pull/12058 I fixed it by adding this line ``` AND topics.id IN(SELECT id FROM topics ORDER BY created_at DESC LIMIT :max_new_topics) ``` This time it is left joining a limited amount of topics. I tested it on few databases and it worked quite smooth
50 lines
1.8 KiB
Ruby
50 lines
1.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe DismissTopics do
|
|
fab!(:user) { Fabricate(:user, created_at: 1.days.ago) }
|
|
fab!(:category) { Fabricate(:category) }
|
|
fab!(:topic1) { Fabricate(:topic, category: category, created_at: 60.minutes.ago) }
|
|
fab!(:topic2) { Fabricate(:topic, category: category, created_at: 120.minutes.ago) }
|
|
|
|
describe '#perform!' do
|
|
it 'dismisses two topics' do
|
|
expect { described_class.new(user, Topic.all).perform! }.to change { DismissedTopicUser.count }.by(2)
|
|
end
|
|
|
|
it 'returns dismissed topic ids' do
|
|
expect(described_class.new(user, Topic.all).perform!.sort).to eq([topic1.id, topic2.id])
|
|
end
|
|
|
|
it 'respects max_new_topics limit' do
|
|
SiteSetting.max_new_topics = 1
|
|
expect { described_class.new(user, Topic.all).perform! }.to change { DismissedTopicUser.count }.by(1)
|
|
|
|
dismissed_topic_user = DismissedTopicUser.last
|
|
|
|
expect(dismissed_topic_user.user_id).to eq(user.id)
|
|
expect(dismissed_topic_user.topic_id).to eq(topic1.id)
|
|
expect(dismissed_topic_user.created_at).not_to be_nil
|
|
end
|
|
|
|
it 'respects seen topics' do
|
|
Fabricate(:topic_user, user: user, topic: topic1)
|
|
Fabricate(:topic_user, user: user, topic: topic2)
|
|
expect { described_class.new(user, Topic.all).perform! }.to change { DismissedTopicUser.count }.by(0)
|
|
end
|
|
|
|
it 'respects new_topic_duration_minutes' do
|
|
user.user_option.update!(new_topic_duration_minutes: 70)
|
|
|
|
expect { described_class.new(user, Topic.all).perform! }.to change { DismissedTopicUser.count }.by(1)
|
|
|
|
dismissed_topic_user = DismissedTopicUser.last
|
|
|
|
expect(dismissed_topic_user.user_id).to eq(user.id)
|
|
expect(dismissed_topic_user.topic_id).to eq(topic1.id)
|
|
expect(dismissed_topic_user.created_at).not_to be_nil
|
|
end
|
|
end
|
|
end
|