Test subscriptions

Author: CrisBarreiro

content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/messaging/WebCompatMessagingPlugin.kt

@@ -53,7 +53,6 @@ class WebCompatMessagingPlugin @Inject constructor(
     private val globalHandlers: PluginPoint<GlobalContentScopeJsMessageHandlersPlugin>,
     private val adsJsContentScopeScripts: AdsJsContentScopeScripts,
     private val dispatcherProvider: DispatcherProvider,
-    private val contentScopeScriptsFeature: ContentScopeScriptsFeature,
 ) : WebMessagingPlugin {
 
     private val moshi = Moshi.Builder().add(JSONObjectAdapter()).build()
@@ -162,7 +161,7 @@ class WebCompatMessagingPlugin @Inject constructor(
 
             //TODO (cbarreiro) temporary, remove
             val newWebCompatApisEnabled = runBlocking {
-                contentScopeScriptsFeature.useNewWebCompatApis().isEnabled()
+                adsJsContentScopeScripts.isEnabled()
             }
 
             if (!newWebCompatApisEnabled) {
@@ -178,9 +177,8 @@ class WebCompatMessagingPlugin @Inject constructor(
                 moshi.adapter(SubscriptionEvent::class.java).toJson(it)
             }
 
-            globalReplyProxy?.postMessage(subscriptionEvent)?.let {
-                true
-            } ?: false
+            globalReplyProxy?.postMessage(subscriptionEvent)
+            true
         }.getOrElse { false }
     }
 }

content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/messaging/WebCompatMessagingPluginTest.kt

@@ -25,18 +25,27 @@ import com.duckduckgo.contentscopescripts.api.GlobalContentScopeJsMessageHandler
 import com.duckduckgo.contentscopescripts.api.GlobalJsMessageHandler
 import com.duckduckgo.contentscopescripts.api.WebCompatContentScopeJsMessageHandlersPlugin
 import com.duckduckgo.contentscopescripts.impl.AdsJsContentScopeScripts
+import com.duckduckgo.contentscopescripts.impl.ContentScopeScriptsFeature
 import com.duckduckgo.js.messaging.api.JsMessage
+import com.duckduckgo.js.messaging.api.SubscriptionEventData
 import com.duckduckgo.js.messaging.api.WebCompatMessageHandler
 import com.duckduckgo.js.messaging.api.WebViewCompatMessageCallback
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNull
 import kotlinx.coroutines.test.runTest
 import org.json.JSONObject
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.any
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 
 @RunWith(AndroidJUnit4::class)
@@ -247,6 +256,65 @@ class WebCompatMessagingPluginTest {
         assertEquals("contentScopeAdsjs", capturedObjectName)
     }
 
+    // @Test
+    // fun `when posting message and adsjs is disabled then do not post message`() = runTest {
+    //     whenever(adsJsContentScopeScripts.isEnabled()).thenReturn(false)
+    //     val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
+    //     givenInterfaceIsRegistered()
+    //     processInitialPing()
+    //
+    //     val result = testee.postMessage(eventData)
+    //
+    //     verify(mockWebView, never()).safePostMessage(any(), any())
+    //     assertFalse(result)
+    // }
+    //
+    // @Test
+    // fun `when posting message and adsjs is enabled but webView not registered then do not post message`() = runTest {
+    //     whenever(adsJsContentScopeScripts.isEnabled()).thenReturn(true)
+    //     val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
+    //     processInitialPing()
+    //
+    //     val result = testee.postMessage(eventData)
+    //
+    //     verify(mockWebView, never()).safePostMessage(any(), any())
+    //     assertFalse(result)
+    // }
+    //
+    // @Test
+    // fun `when posting message and adsjs is enabled but initialPing not processes then do not post message`() = runTest {
+    //     whenever(adsJsContentScopeScripts.isEnabled()).thenReturn(true)
+    //     val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
+    //
+    //     val result = testee.postMessage(eventData)
+    //
+    //     verify(mockWebView, never()).safePostMessage(any(), any())
+    //     assertFalse(result)
+    // }
+    //
+    // @Test
+    // fun `when posting message after getting initialPing and adsjs is enabled then post message`() = runTest {
+    //     whenever(adsJsContentScopeScripts.isEnabled()).thenReturn(true)
+    //     val eventData = SubscriptionEventData("feature", "subscription", JSONObject())
+    //     givenInterfaceIsRegistered()
+    //     processInitialPing()
+    //     verify(mockWebView, never()).postWebMessage(any(), any())
+    //
+    //     val result = testee.postMessage(eventData)
+    //
+    //     verify(mockWebView).safePostMessage(any(), any())
+    //     assertTrue(result)
+    // }
+
+    private fun processInitialPing() = runTest {
+        val message = """
+            {"context":"contentScopeScripts","featureName":"messaging","id":"debugId","method":"initialPing","params":{}}
+        """.trimIndent()
+        testee.process(message, callback, mockReplyProxy)
+    }
+
+
+
     private val callback = object : WebViewCompatMessageCallback() {
         var counter = 0
         override fun process(