From 2daac150da5f6c0bbce8c0160efdafacf900fd40 Mon Sep 17 00:00:00 2001
From: Daniel Bernal <dbernal@duckduckgo.com>
Date: Mon, 11 Nov 2024 19:36:55 +0100
Subject: [PATCH] Base Pixel Implementation

Implement pixels for youtubeOverlay behavior
---
 .../DuckPlayerNavigationHandler.swift         |  18 +-
 .../DuckPlayerOverlayUsagePixels.swift        |  98 +++----
 DuckDuckGo/TabViewController.swift            |   2 +-
 .../DuckPlayerOverlayUsagePixelsTests.swift   | 247 ++++++------------
 4 files changed, 124 insertions(+), 241 deletions(-)

diff --git a/DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift b/DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
index f64a61f558..dc00d0cc3d 100644
--- a/DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
+++ b/DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
@@ -117,7 +117,7 @@ final class DuckPlayerNavigationHandler: NSObject {
          pixelFiring: PixelFiring.Type = Pixel.self,
          dailyPixelFiring: DailyPixelFiring.Type = DailyPixel.self,
          tabNavigationHandler: DuckPlayerTabNavigationHandling? = nil,
-         duckPlayerOverlayUsagePixels: DuckPlayerOverlayPixelFiring? = nil) {
+         duckPlayerOverlayUsagePixels: DuckPlayerOverlayPixelFiring? = DuckPlayerOverlayUsagePixels()) {
         self.duckPlayer = duckPlayer
         self.featureFlagger = featureFlagger
         self.appSettings = appSettings
@@ -575,9 +575,7 @@ final class DuckPlayerNavigationHandler: NSObject {
             // Watch in YT videos always open in new tab
             redirectToYouTubeVideo(url: url, webView: webView, forceNewTab: true)
         }
-    
-    
-    }
+    }    
     
 }
 
@@ -663,9 +661,6 @@ extension DuckPlayerNavigationHandler: DuckPlayerNavigationHandling {
     @MainActor
     func handleURLChange(webView: WKWebView) -> DuckPlayerNavigationHandlerURLChangeResult {
         
-        // Track overlayUsagePixels
-        duckPlayerOverlayUsagePixels?.registerNavigation(url: webView.url)
-        
         // We want to prevent multiple simultaneous redirects
         // This can be caused by Duplicate Nav events, and quick URL changes
         if let lastTimestamp = lastURLChangeHandling,
@@ -676,6 +671,11 @@ extension DuckPlayerNavigationHandler: DuckPlayerNavigationHandling {
         // Update the Referrer based on the first URL change detected
         setReferrer(webView: webView)
         
+        // Overlay Usage Pixel handling
+        if let url = webView.url {
+            duckPlayerOverlayUsagePixels?.handleNavigationAndFirePixels(url: url, duckPlayerMode: duckPlayerMode)
+        }
+        
         // We don't want YouTube redirects happening while default navigation is happening
         // This can be caused by Duplicate Nav events, and quick URL changes
         if let lastTimestamp = lastNavigationHandling,
@@ -735,7 +735,7 @@ extension DuckPlayerNavigationHandler: DuckPlayerNavigationHandling {
     @MainActor
     func handleGoBack(webView: WKWebView) {
                 
-        guard isDuckPlayerFeatureEnabled else {
+        guard let url = webView.url, url.isDuckPlayer, isDuckPlayerFeatureEnabled else {
             webView.goBack()
             return
         }
@@ -783,7 +783,7 @@ extension DuckPlayerNavigationHandler: DuckPlayerNavigationHandling {
         guard let url = webView.url else {
             return
         }
-            
+                    
         if url.isDuckPlayer, duckPlayerMode != .disabled {
             redirectToDuckPlayerVideo(url: url, webView: webView, disableNewTab: true)
             return
diff --git a/DuckDuckGo/DuckPlayer/DuckPlayerOverlayUsagePixels.swift b/DuckDuckGo/DuckPlayer/DuckPlayerOverlayUsagePixels.swift
index 459b762f40..54c94f428e 100644
--- a/DuckDuckGo/DuckPlayer/DuckPlayerOverlayUsagePixels.swift
+++ b/DuckDuckGo/DuckPlayer/DuckPlayerOverlayUsagePixels.swift
@@ -24,14 +24,7 @@ protocol DuckPlayerOverlayPixelFiring {
     var pixelFiring: PixelFiring.Type { get set }
     var navigationHistory: [URL] { get set }
     
-    func registerNavigation(url: URL?)
-    func navigationBack(duckPlayerMode: DuckPlayerMode)
-    func navigationReload(duckPlayerMode: DuckPlayerMode)
-    func navigationWithinYoutube(duckPlayerMode: DuckPlayerMode)
-    func navigationOutsideYoutube(duckPlayerMode: DuckPlayerMode)
-    func navigationClosed(duckPlayerMode: DuckPlayerMode)
-    func overlayIdle(duckPlayerMode: DuckPlayerMode)
-    
+    func handleNavigationAndFirePixels(url: URL?, duckPlayerMode: DuckPlayerMode)
 }
 
 final class DuckPlayerOverlayUsagePixels: DuckPlayerOverlayPixelFiring {
@@ -55,69 +48,56 @@ final class DuckPlayerOverlayUsagePixels: DuckPlayerOverlayPixelFiring {
         idleTimer = nil
     }
 
-    func registerNavigation(url: URL?) {
+    func handleNavigationAndFirePixels(url: URL?, duckPlayerMode: DuckPlayerMode) {
         guard let url = url else { return }
-        navigationHistory.append(url)
-        
-        // Cancel and reset the idle timer whenever a new navigation occurs
-        resetIdleTimer()
-    }
+        let comparisonURL = url.forComparison()
 
-    func navigationBack(duckPlayerMode: DuckPlayerMode) {
-        guard duckPlayerMode == .alwaysAsk,
-              let lastURL = navigationHistory.last,
-              lastURL.isYoutubeWatch else { return }
-
-        pixelFiring.fire(.duckPlayerYouTubeOverlayNavigationBack, withAdditionalParameters: [:])
-    }
+        // Only append the URL if it's different from the last entry in normalized form
+        navigationHistory.append(comparisonURL)
 
-    func navigationReload(duckPlayerMode: DuckPlayerMode) {
-        guard duckPlayerMode == .alwaysAsk,
-              let lastURL = navigationHistory.last,
-              lastURL.isYoutubeWatch else { return }
-
-        pixelFiring.fire(.duckPlayerYouTubeOverlayNavigationRefresh, withAdditionalParameters: [:])
-    }
-
-    func navigationWithinYoutube(duckPlayerMode: DuckPlayerMode) {
+        // DuckPlayer is in Ask Mode, there's navigation history, and last URL is a YouTube Watch Video
         guard duckPlayerMode == .alwaysAsk,
               navigationHistory.count > 1,
               let currentURL = navigationHistory.last,
               let previousURL = navigationHistory.dropLast().last,
-              previousURL.isYoutubeWatch,
-              currentURL.isYoutube else { return }
+              previousURL.isYoutubeWatch else { return }
 
-        pixelFiring.fire(.duckPlayerYouTubeNavigationWithinYouTube, withAdditionalParameters: [:])
-    }
+        var isReload = false
+        // Check for a reload condition: when current videoID is the same as Previous
+        if let currentVideoID = currentURL.youtubeVideoParams?.videoID,
+           let previousVideoID = previousURL.youtubeVideoParams?.videoID {
+            isReload = currentVideoID == previousVideoID
+        }
 
-    func navigationOutsideYoutube(duckPlayerMode: DuckPlayerMode) {
-        guard duckPlayerMode == .alwaysAsk,
-              navigationHistory.count > 1,
-              let currentURL = navigationHistory.last,
-              let previousURL = navigationHistory.dropLast().last,
-              previousURL.isYoutubeWatch,
-              !currentURL.isYoutube else { return }
+        // Fire the reload pixel if this is a reload navigation
+        if isReload {
+            pixelFiring.fire(.duckPlayerYouTubeOverlayNavigationRefresh, withAdditionalParameters: [:])
+        } else {
+            // Determine if it’s a back navigation by looking further back in history
+            let isBackNavigation = navigationHistory.count > 2 &&
+                                   navigationHistory[navigationHistory.count - 3].forComparison() == currentURL.forComparison()
+
+            // Fire the appropriate pixel based on navigation type
+            if isBackNavigation {
+                pixelFiring.fire(.duckPlayerYouTubeOverlayNavigationBack, withAdditionalParameters: [:])
+            } else if previousURL.isYoutubeWatch && currentURL.isYoutube {
+                // Forward navigation within YouTube (including non-video URLs)
+                pixelFiring.fire(.duckPlayerYouTubeNavigationWithinYouTube, withAdditionalParameters: [:])
+            } else if previousURL.isYoutubeWatch && !currentURL.isYoutube {
+                // Navigation outside YouTube
+                pixelFiring.fire(.duckPlayerYouTubeOverlayNavigationOutsideYoutube, withAdditionalParameters: [:])
+            }
+        }
 
-        pixelFiring.fire(.duckPlayerYouTubeOverlayNavigationOutsideYoutube, withAdditionalParameters: [:])
-    }
+        // Refined truncation logic:
+        if let lastOccurrenceIndex = (0..<navigationHistory.count - 1).last(where: { navigationHistory[$0].forComparison() == comparisonURL }) {
+            // Truncate history to keep only up to the last occurrence of the current URL in normalized form
+            navigationHistory = Array(navigationHistory.prefix(upTo: lastOccurrenceIndex + 1))
+        }
 
-    func navigationClosed(duckPlayerMode: DuckPlayerMode) {
-        
-        guard duckPlayerMode == .alwaysAsk,
-              let lastURL = navigationHistory.last,
-              lastURL.isYoutubeWatch else { return }
-        
-        pixelFiring.fire(.duckPlayerYouTubeOverlayNavigationClosed, withAdditionalParameters: [:])
-        
+        // Cancel and reset the idle timer whenever a new navigation occurs
+        resetIdleTimer()
     }
 
-    func overlayIdle(duckPlayerMode: DuckPlayerMode) {
-        guard duckPlayerMode == .alwaysAsk,
-              let lastURL = navigationHistory.last,
-              lastURL.isYoutubeWatch else { return }
 
-        idleTimer = Timer.scheduledTimer(withTimeInterval: idleTimeInterval, repeats: false) { [weak self] _ in
-            self?.pixelFiring.fire(.duckPlayerYouTubeNavigationIdle30, withAdditionalParameters: [:])
-        }
-    }
 }
diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift
index 6be661152c..ac162fac21 100644
--- a/DuckDuckGo/TabViewController.swift
+++ b/DuckDuckGo/TabViewController.swift
@@ -867,7 +867,7 @@ class TabViewController: UIViewController {
         }
 
         if webView.canGoBack {
-            webView.goBack()
+            webView.goBack()            
             chromeDelegate?.omniBar.resignFirstResponder()
             return
         }
diff --git a/DuckDuckGoTests/DuckPlayerOverlayUsagePixelsTests.swift b/DuckDuckGoTests/DuckPlayerOverlayUsagePixelsTests.swift
index dc5be8e048..7f966f334f 100644
--- a/DuckDuckGoTests/DuckPlayerOverlayUsagePixelsTests.swift
+++ b/DuckDuckGoTests/DuckPlayerOverlayUsagePixelsTests.swift
@@ -27,201 +27,104 @@ class DuckPlayerOverlayUsagePixelsTests: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        // Initialize DuckPlayerOverlayUsagePixels with a shorter timeoutInterval for testing
         PixelFiringMock.tearDown()
         duckPlayerOverlayPixels = DuckPlayerOverlayUsagePixels(pixelFiring: PixelFiringMock.self, timeoutInterval: 3.0)
     }
 
     override func tearDown() {
-        // Clean up after each test
         PixelFiringMock.tearDown()
         duckPlayerOverlayPixels = nil
         super.tearDown()
     }
-
-    func testRegisterNavigationAddsURLToHistory() {
-        // Arrange
-        let testURL = URL(string: "https://www.example.com")!
-
-        // Act
-        duckPlayerOverlayPixels.registerNavigation(url: testURL)
-
-        // Assert
-        XCTAssertEqual(duckPlayerOverlayPixels.navigationHistory.count, 1)
-        XCTAssertEqual(duckPlayerOverlayPixels.navigationHistory.first, testURL)
-    }
-
-    func testRegisterNavigationWithNilURLDoesNotAddToHistory() {
-        // Act
-        duckPlayerOverlayPixels.registerNavigation(url: nil)
-
-        // Assert
-        XCTAssertTrue(duckPlayerOverlayPixels.navigationHistory.isEmpty, "Navigation history should remain empty when registering a nil URL.")
-    }
-
-    func testNavigationBackFiresPixelWhenConditionsMet() {
-        // Arrange
-        let testURL = URL(string: "https://www.youtube.com/watch?v=example")!
-        duckPlayerOverlayPixels.registerNavigation(url: testURL)
-
-        // Act
-        duckPlayerOverlayPixels.navigationBack(duckPlayerMode: .alwaysAsk)
-
-        // Assert
+    
+    // Test: Registering navigation appends URL to history
+    func testRegisterNavigationAppendsURLToHistory() {
+        let testURL1 = URL(string: "https://www.youtube.com/watch?v=example1")!
+        let testURL2 = URL(string: "https://www.youtube.com/playlist?list=PL-gbSnmxoBbmDnoFdZY5OsSuU6kqs_07a")!
+        let testURL3 = URL(string: "https://www.example.com")!
+        
+        // Simulate navigation actions
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: testURL1, duckPlayerMode: .alwaysAsk)
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: testURL2, duckPlayerMode: .alwaysAsk)
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: testURL3, duckPlayerMode: .alwaysAsk)
+        
+        // Verify the URLs are appended in order
+        XCTAssertEqual(duckPlayerOverlayPixels.navigationHistory.count, 3)
+        XCTAssertEqual(duckPlayerOverlayPixels.navigationHistory[0], testURL1.forComparison())
+        XCTAssertEqual(duckPlayerOverlayPixels.navigationHistory[1], testURL2.forComparison())
+        XCTAssertEqual(duckPlayerOverlayPixels.navigationHistory[2], testURL3.forComparison())
+    }
+
+    // Test: Back navigation triggers duckPlayerYouTubeOverlayNavigationBack pixel
+    func testBackNavigationTriggersBackPixel() {
+        let firstURL = URL(string: "https://www.youtube.com/watch?v=example1")!
+        let secondURL = URL(string: "https://www.youtube.com/watch?v=example2")!
+        
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: firstURL, duckPlayerMode: .alwaysAsk)
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: secondURL, duckPlayerMode: .alwaysAsk)
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: firstURL, duckPlayerMode: .alwaysAsk) // Simulates back navigation
+        
         XCTAssertEqual(PixelFiringMock.lastPixelName, Pixel.Event.duckPlayerYouTubeOverlayNavigationBack.name)
-        XCTAssertNotNil(PixelFiringMock.lastPixelInfo, "Pixel should be fired when conditions are met for navigationBack.")
+        XCTAssertNotNil(PixelFiringMock.lastPixelInfo, "Pixel should be fired on back navigation.")
     }
 
-    func testNavigationBackDoesNotFirePixelWhenConditionsNotMet() {
-        // Act
-        duckPlayerOverlayPixels.navigationBack(duckPlayerMode: .enabled)
-
-        // Assert
-        XCTAssertNil(PixelFiringMock.lastPixelName, "Pixel should not be fired when conditions are not met for navigationBack.")
-    }
-
-    func testNavigationReloadFiresPixelWhenConditionsMet() {
-        // Arrange
-        let testURL = URL(string: "https://www.youtube.com/watch?v=example")!
-        duckPlayerOverlayPixels.registerNavigation(url: testURL)
-
-        // Act
-        duckPlayerOverlayPixels.navigationReload(duckPlayerMode: .alwaysAsk)
-
-        // Assert
+    // Test: Reload navigation triggers duckPlayerYouTubeOverlayNavigationRefresh pixel
+    func testReloadNavigationTriggersRefreshPixel() {
+        let testURL = URL(string: "https://www.youtube.com/watch?v=XTWWSS")!
+        
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: testURL, duckPlayerMode: .alwaysAsk)
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: testURL, duckPlayerMode: .alwaysAsk) // Simulates reload navigation
+        
         XCTAssertEqual(PixelFiringMock.lastPixelName, Pixel.Event.duckPlayerYouTubeOverlayNavigationRefresh.name)
-        XCTAssertNotNil(PixelFiringMock.lastPixelInfo, "Pixel should be fired when conditions are met for navigationReload.")
-    }
-
-    func testNavigationReloadDoesNotFirePixelWhenConditionsNotMet() {
-        // Act
-        duckPlayerOverlayPixels.navigationReload(duckPlayerMode: .enabled)
-
-        // Assert
-        XCTAssertNil(PixelFiringMock.lastPixelName, "Pixel should not be fired when conditions are not met for navigationReload.")
+        XCTAssertNotNil(PixelFiringMock.lastPixelInfo, "Pixel should be fired on reload navigation.")
     }
 
-    func testNavigationWithinYoutubeFiresPixelWhenConditionsMet() {
-        // Arrange
-        let previousURL = URL(string: "https://www.youtube.com/watch?v=example1")!
-        let currentURL = URL(string: "https://www.youtube.com/watch?v=example2")!
-        duckPlayerOverlayPixels.registerNavigation(url: previousURL)
-        duckPlayerOverlayPixels.registerNavigation(url: currentURL)
-
-        // Act
-        duckPlayerOverlayPixels.navigationWithinYoutube(duckPlayerMode: .alwaysAsk)
-
-        // Assert
+    // Test: Forward navigation to various YouTube URLs triggers duckPlayerYouTubeNavigationWithinYouTube pixel
+    func testNavigateWithinYoutubeTriggersWithinYouTubePixel() {
+        let videoURL = URL(string: "https://www.youtube.com/watch?v=example1")!
+        let playlistURL = URL(string: "https://www.youtube.com/playlist?list=PL-gbSnmxoBbmDnoFdZY5OsSuU6kqs_07a")!
+        
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: videoURL, duckPlayerMode: .alwaysAsk)
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: playlistURL, duckPlayerMode: .alwaysAsk)
+        
         XCTAssertEqual(PixelFiringMock.lastPixelName, Pixel.Event.duckPlayerYouTubeNavigationWithinYouTube.name)
-        XCTAssertNotNil(PixelFiringMock.lastPixelInfo, "Pixel should be fired when conditions are met for navigationWithinYoutube.")
-    }
-
-    func testNavigationWithinYoutubeDoesNotFirePixelWhenConditionsNotMet() {
-        // Arrange
-        let testURL = URL(string: "https://www.example.com")!
-        duckPlayerOverlayPixels.registerNavigation(url: testURL)
-
-        // Act
-        duckPlayerOverlayPixels.navigationWithinYoutube(duckPlayerMode: .alwaysAsk)
-
-        // Assert
-        XCTAssertNil(PixelFiringMock.lastPixelName, "Pixel should not be fired when conditions are not met for navigationWithinYoutube.")
+        XCTAssertNotNil(PixelFiringMock.lastPixelInfo, "Pixel should be fired when navigating within YouTube to a non-video URL.")
     }
 
-    func testNavigationOutsideYoutubeFiresPixelWhenConditionsMet() {
-        // Arrange
-        let previousURL = URL(string: "https://www.youtube.com/watch?v=example1")!
-        let currentURL = URL(string: "https://www.example.com")!
-        duckPlayerOverlayPixels.registerNavigation(url: previousURL)
-        duckPlayerOverlayPixels.registerNavigation(url: currentURL)
-
-        // Act
-        duckPlayerOverlayPixels.navigationOutsideYoutube(duckPlayerMode: .alwaysAsk)
-
-        // Assert
+    // Test: Navigating outside YouTube triggers duckPlayerYouTubeOverlayNavigationOutsideYoutube pixel
+    func testNavigateOutsideYoutubeTriggersOutsideYouTubePixel() {
+        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=example1")!
+        let outsideURL = URL(string: "https://www.example.com")!
+        
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: youtubeURL, duckPlayerMode: .alwaysAsk)
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: outsideURL, duckPlayerMode: .alwaysAsk)
+        
         XCTAssertEqual(PixelFiringMock.lastPixelName, Pixel.Event.duckPlayerYouTubeOverlayNavigationOutsideYoutube.name)
-        XCTAssertNotNil(PixelFiringMock.lastPixelInfo, "Pixel should be fired when conditions are met for navigationOutsideYoutube.")
+        XCTAssertNotNil(PixelFiringMock.lastPixelInfo, "Pixel should be fired when navigating outside YouTube.")
     }
 
-    func testNavigationOutsideYoutubeDoesNotFirePixelWhenConditionsNotMet() {
-        // Arrange
-        let testURL = URL(string: "https://www.youtube.com/watch?v=example")!
-        duckPlayerOverlayPixels.registerNavigation(url: testURL)
-
-        // Act
-        duckPlayerOverlayPixels.navigationOutsideYoutube(duckPlayerMode: .alwaysAsk)
-
-        // Assert
-        XCTAssertNil(PixelFiringMock.lastPixelName, "Pixel should not be fired when conditions are not met for navigationOutsideYoutube.")
+    // Negative Test: Back navigation does not trigger within YouTube or outside YouTube pixel
+    func testBackNavigationDoesNotTriggerWithinOrOutsideYouTubePixel() {
+        let firstURL = URL(string: "https://www.youtube.com/watch?v=example1")!
+        let secondURL = URL(string: "https://www.youtube.com/watch?v=example2")!
+        let backURL = URL(string: "https://www.youtube.com/watch?v=example1")!
+        
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: firstURL, duckPlayerMode: .alwaysAsk)
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: secondURL, duckPlayerMode: .alwaysAsk)
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: backURL, duckPlayerMode: .alwaysAsk) // Simulates back navigation
+        
+        XCTAssertNotEqual(PixelFiringMock.lastPixelName, Pixel.Event.duckPlayerYouTubeNavigationWithinYouTube.name, "Within YouTube pixel should not fire on back navigation.")
+        XCTAssertNotEqual(PixelFiringMock.lastPixelName, Pixel.Event.duckPlayerYouTubeOverlayNavigationOutsideYoutube.name, "Outside YouTube pixel should not fire on back navigation.")
     }
 
-    func testOverlayIdleStartsTimerAndFiresPixelAfter3Seconds() {
-        // Arrange
+    // Negative Test: Reload navigation does not trigger within YouTube or outside YouTube pixel
+    func testReloadNavigationDoesNotTriggerWithinOrOutsideYouTubePixel() {
         let testURL = URL(string: "https://www.youtube.com/watch?v=example")!
-        duckPlayerOverlayPixels.registerNavigation(url: testURL)
-
-        // Act
-        duckPlayerOverlayPixels.overlayIdle(duckPlayerMode: .alwaysAsk)
-
-        // Simulate waiting for 3 seconds
-        let expectation = XCTestExpectation(description: "Wait for the pixel to be fired after 3 seconds.")
-        DispatchQueue.main.asyncAfter(deadline: .now() + 3.1) {
-            expectation.fulfill()
-        }
-
-        wait(for: [expectation], timeout: 5)
-
-        // Assert
-        XCTAssertEqual(PixelFiringMock.lastPixelName, Pixel.Event.duckPlayerYouTubeNavigationIdle30.name)
-        XCTAssertNotNil(PixelFiringMock.lastPixelInfo, "Pixel should be fired after 3 seconds of inactivity.")
-    }
-
-    func testOverlayIdleDoesNotFirePixelWhenNavigationHistoryIsNotYouTubeWatch() {
-        // Arrange
-        let testURL = URL(string: "https://www.example.com")!
-        duckPlayerOverlayPixels.registerNavigation(url: testURL)
-
-        // Act
-        duckPlayerOverlayPixels.overlayIdle(duckPlayerMode: .alwaysAsk)
-
-        // Assert
-        XCTAssertNil(PixelFiringMock.lastPixelName, "Pixel should not be fired if the last URL is not a YouTube watch URL.")
-    }
-
-    func testOverlayIdleDoesNotStartTimerIfModeIsNotAlwaysAsk() {
-        // Arrange
-        let testURL = URL(string: "https://www.youtube.com/watch?v=example")!
-        duckPlayerOverlayPixels.registerNavigation(url: testURL)
-
-        // Act
-        duckPlayerOverlayPixels.overlayIdle(duckPlayerMode: .enabled)
-
-        // Assert
-        XCTAssertNil(PixelFiringMock.lastPixelName, "Pixel should not be fired if the mode is not .alwaysAsk.")
-    }
-    
-    func testNavigationClosedFiresPixelWhenConditionsMet() {
-        // Arrange
-        let testURL = URL(string: "https://www.youtube.com/watch?v=example")!
-        duckPlayerOverlayPixels.registerNavigation(url: testURL)
-
-        // Act
-        duckPlayerOverlayPixels.navigationClosed(duckPlayerMode: .alwaysAsk)
-
-        // Assert
-        XCTAssertEqual(PixelFiringMock.lastPixelName, Pixel.Event.duckPlayerYouTubeOverlayNavigationClosed.name)
-        XCTAssertNotNil(PixelFiringMock.lastPixelInfo, "Pixel should be fired when conditions are met for navigationReload.")
-    }
-    
-    func testNavigationClosedDoesNotFirePixelWhenConditionsNotMet() {
-        // Arrange
-        let testURL = URL(string: "https://www.youtube.com")!
-        duckPlayerOverlayPixels.registerNavigation(url: testURL)
-
-        // Act
-        duckPlayerOverlayPixels.navigationClosed(duckPlayerMode: .enabled)
-
-        // Assert
-        XCTAssertNil(PixelFiringMock.lastPixelName, "Pixel should not be fired when conditions are not met for navigationClosed.")
+        
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: testURL, duckPlayerMode: .alwaysAsk)
+        duckPlayerOverlayPixels.handleNavigationAndFirePixels(url: testURL, duckPlayerMode: .alwaysAsk) // Simulates reload navigation
+        
+        XCTAssertNotEqual(PixelFiringMock.lastPixelName, Pixel.Event.duckPlayerYouTubeNavigationWithinYouTube.name, "Within YouTube pixel should not fire on reload.")
+        XCTAssertNotEqual(PixelFiringMock.lastPixelName, Pixel.Event.duckPlayerYouTubeOverlayNavigationOutsideYoutube.name, "Outside YouTube pixel should not fire on reload.")
     }
 }