fix: observe merge and tests

Signed-off-by: Fabrizio Demaria <[email protected]>
open-feature · Sep 6, 2024 · 96f51a7 · 96f51a7
1 parent 0ed88c5
commit 96f51a7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 36 deletions.
diff --git a/Sources/OpenFeature/OpenFeatureAPI.swift b/Sources/OpenFeature/OpenFeatureAPI.swift
@@ -99,10 +99,9 @@ public class OpenFeatureAPI {
     public func observe() -> AnyPublisher<ProviderEvent?, Never> {
         return providerSubject.map { provider in
             if let provider = provider {
-                let test = provider.observe()
-                    .append(self.eventHandler.observe())
+                return provider.observe()
+                    .merge(with: self.eventHandler.observe())
                     .eraseToAnyPublisher()
-                return test
             } else {
                 return Empty<ProviderEvent?, Never>()
                     .eraseToAnyPublisher()

diff --git a/Sources/OpenFeature/Provider/NoOpProvider.swift b/Sources/OpenFeature/Provider/NoOpProvider.swift
@@ -15,11 +15,9 @@ class NoOpProvider: FeatureProvider {
     var hooks: [any Hook] = []
 
     func onContextSet(oldContext: EvaluationContext?, newContext: EvaluationContext) {
-        eventHandler.send(.ready)
     }
 
     func initialize(initialContext: EvaluationContext?) {
-        eventHandler.send(.ready)
     }
 
     func getBooleanEvaluation(key: String, defaultValue: Bool, context: EvaluationContext?) throws

diff --git a/Tests/OpenFeatureTests/DeveloperExperienceTests.swift b/Tests/OpenFeatureTests/DeveloperExperienceTests.swift
@@ -47,7 +47,6 @@ final class DeveloperExperienceTests: XCTestCase {
         let readyExpectation = XCTestExpectation(description: "Ready")
         let errorExpectation = XCTestExpectation(description: "Error")
         withExtendedLifetime(
-
             OpenFeatureAPI.shared.observe().sink { event in
                 switch event {
                 case .ready:

diff --git a/Tests/OpenFeatureTests/FlagEvaluationTests.swift b/Tests/OpenFeatureTests/FlagEvaluationTests.swift
@@ -56,7 +56,7 @@ final class FlagEvaluationTests: XCTestCase {
         let readyExpectation = XCTestExpectation(description: "Ready")
         let errorExpectation = XCTestExpectation(description: "Error")
         let staleExpectation = XCTestExpectation(description: "Stale")
-        let eventState = provider.observe().sink { event in
+        let eventState = OpenFeatureAPI.shared.observe().sink { event in
             switch event {
             case .ready:
                 readyExpectation.fulfill()
@@ -109,7 +109,7 @@ final class FlagEvaluationTests: XCTestCase {
     func testDetailedFlagEvaluation() async {
         let provider = DoSomethingProvider()
         let readyExpectation = XCTestExpectation(description: "Ready")
-        let eventState = provider.observe().sink { event in
+        let eventState = OpenFeatureAPI.shared.observe().sink { event in
             switch event {
             case .ready:
                 readyExpectation.fulfill()
@@ -169,7 +169,7 @@ final class FlagEvaluationTests: XCTestCase {
     func testHooksAreFired() async {
         let provider = NoOpProvider()
         let readyExpectation = XCTestExpectation(description: "Ready")
-        let eventState = provider.observe().sink { event in
+        let eventState = OpenFeatureAPI.shared.observe().sink { event in
             switch event {
             case .ready:
                 readyExpectation.fulfill()

diff --git a/Tests/OpenFeatureTests/Helpers/DoSomethingProvider.swift b/Tests/OpenFeatureTests/Helpers/DoSomethingProvider.swift
@@ -8,11 +8,9 @@ class DoSomethingProvider: FeatureProvider {
     private var holdit: AnyCancellable?
 
     func onContextSet(oldContext: OpenFeature.EvaluationContext?, newContext: OpenFeature.EvaluationContext) {
-        eventHandler.send(.ready)
     }
 
     func initialize(initialContext: OpenFeature.EvaluationContext?) {
-        eventHandler.send(.ready)
     }
 
     var hooks: [any OpenFeature.Hook] = []

diff --git a/Tests/OpenFeatureTests/HookSpecTests.swift b/Tests/OpenFeatureTests/HookSpecTests.swift
@@ -7,7 +7,7 @@ final class HookSpecTests: XCTestCase {
     func testNoErrorHookCalled() {
         let provider = NoOpProvider()
         let readyExpectation = XCTestExpectation(description: "Ready")
-        let eventState = provider.observe().sink { event in
+        let eventState = OpenFeatureAPI.shared.observe().sink { event in
             switch event {
             case .ready:
                 readyExpectation.fulfill()
@@ -76,7 +76,7 @@ final class HookSpecTests: XCTestCase {
             BooleanHookMock(prefix: "provider", addEval: addEval)
         ])
         let readyExpectation = XCTestExpectation(description: "Ready")
-        let eventState = providerMock.observe().sink { event in
+        let eventState = OpenFeatureAPI.shared.observe().sink { event in
             switch event {
             case .ready:
                 readyExpectation.fulfill()

diff --git a/Tests/OpenFeatureTests/ProviderEventsTests.swift b/Tests/OpenFeatureTests/ProviderEventsTests.swift