Commit 765155bc authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'move-ff-services-to-core' into 'master'

Move Feature Flag Services to Core RUN AS-IF-FOSS

See merge request gitlab-org/gitlab!42645
parents e342d150 88a68067
...@@ -63,7 +63,7 @@ RSpec.describe FeatureFlags::CreateService do ...@@ -63,7 +63,7 @@ RSpec.describe FeatureFlags::CreateService do
'with strategies <strong>[{"name"=>"default", "parameters"=>{}}]</strong>.' 'with strategies <strong>[{"name"=>"default", "parameters"=>{}}]</strong>.'
expect { subject }.to change { AuditEvent.count }.by(1) expect { subject }.to change { AuditEvent.count }.by(1)
expect(AuditEvent.last.present.action).to eq(expected_message) expect(AuditEvent.last.details[:custom_message]).to eq(expected_message)
end end
context 'when user is reporter' do context 'when user is reporter' do
......
...@@ -19,7 +19,7 @@ RSpec.describe FeatureFlags::DestroyService do ...@@ -19,7 +19,7 @@ RSpec.describe FeatureFlags::DestroyService do
describe '#execute' do describe '#execute' do
subject { described_class.new(project, user, params).execute(feature_flag) } subject { described_class.new(project, user, params).execute(feature_flag) }
let(:audit_event_message) { AuditEvent.last.present.action } let(:audit_event_message) { AuditEvent.last.details[:custom_message] }
let(:params) { {} } let(:params) { {} }
it 'returns status success' do it 'returns status success' do
......
...@@ -19,7 +19,7 @@ RSpec.describe FeatureFlags::UpdateService do ...@@ -19,7 +19,7 @@ RSpec.describe FeatureFlags::UpdateService do
let(:params) { { name: 'new_name' } } let(:params) { { name: 'new_name' } }
let(:audit_event_message) do let(:audit_event_message) do
AuditEvent.last.present.action AuditEvent.last.details[:custom_message]
end end
it 'returns success status' do it 'returns success status' do
......
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