Commit 12b5376a authored by Vitali Tatarintev's avatar Vitali Tatarintev

Merge branch 'pl-clear-memoization-licensed-feature-available-core' into 'master'

Stop clearing memoization of `licensed_feature_available` in CORE

See merge request gitlab-org/gitlab!41144
parents 91a9fbf8 2e185969
...@@ -10,9 +10,8 @@ RSpec.describe Metrics::Dashboard::GitlabAlertEmbedService do ...@@ -10,9 +10,8 @@ RSpec.describe Metrics::Dashboard::GitlabAlertEmbedService do
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:alert_id) { alert.id } let(:alert_id) { alert.id }
before do before_all do
project.add_maintainer(user) project.add_maintainer(user)
project.clear_memoization(:licensed_feature_available)
end end
describe '.valid_params?' do describe '.valid_params?' do
......
...@@ -6,8 +6,6 @@ RSpec.describe Projects::Alerting::NotifyService do ...@@ -6,8 +6,6 @@ RSpec.describe Projects::Alerting::NotifyService do
let_it_be(:project, reload: true) { create(:project, :repository) } let_it_be(:project, reload: true) { create(:project, :repository) }
before do before do
# We use `let_it_be(:project)` so we make sure to clear caches
project.clear_memoization(:licensed_feature_available)
allow(ProjectServiceWorker).to receive(:perform_async) allow(ProjectServiceWorker).to receive(:perform_async)
end end
......
...@@ -16,11 +16,6 @@ RSpec.describe Projects::Prometheus::Alerts::NotifyService do ...@@ -16,11 +16,6 @@ RSpec.describe Projects::Prometheus::Alerts::NotifyService do
let(:subject) { service.execute(token_input) } let(:subject) { service.execute(token_input) }
before do
# We use `let_it_be(:project)` so we make sure to clear caches
project.clear_memoization(:licensed_feature_available)
end
context 'with valid payload' do context 'with valid payload' do
let_it_be(:alert_firing) { create(:prometheus_alert, project: project) } let_it_be(:alert_firing) { create(:prometheus_alert, project: project) }
let_it_be(:alert_resolved) { create(:prometheus_alert, project: project) } let_it_be(:alert_resolved) { create(:prometheus_alert, project: project) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment