Skip to content

Commit 11cabd5

Browse files
committed
Clean up merge conflicts in component spec
1 parent 1ca046e commit 11cabd5

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

spec/datadog/open_feature/component_spec.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,14 @@
7878
end
7979

8080
describe '#shutdown!' do
81-
<<<<<<< HEAD
82-
=======
83-
subject(:component) { described_class.new(settings, agent_settings, logger: logger, telemetry: telemetry) }
84-
85-
>>>>>>> 0f5c9c2e83 (Create Reporter for exposures reporting)
8681
before do
8782
settings.open_feature.enabled = true
8883
settings.remote.enabled = true
8984
end
9085

91-
<<<<<<< HEAD
9286
subject(:component) { described_class.new(settings, agent_settings, logger: logger, telemetry: telemetry) }
9387

9488
it 'flushes worker and stops it' do
95-
=======
96-
it 'flushes reporter cache and stops worker' do
97-
expect(reporter).to receive(:clear)
98-
>>>>>>> 0f5c9c2e83 (Create Reporter for exposures reporting)
9989
expect(worker).to receive(:flush)
10090
expect(worker).to receive(:stop).with(true)
10191

0 commit comments

Comments
 (0)