Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

showSecondLayer crashes with empty options #126

Merged
merged 2 commits into from
Jul 26, 2024
Merged

showSecondLayer crashes with empty options #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6c6a2d
fixed bug in android
uc-franciscocunha Jul 25, 2024
2d9dfda
improved ios tests
uc-franciscocunha Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 54 additions & 2 deletions android/src/androidTest/java/com/usercentrics/reactnativemodule/RNUsercentricsModuleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ class RNUsercentricsModuleTest {
}

@Test
fun testShowFirstLayer() {
fun testShowFirstLayerBannerSettingsObject() {
val usercentricsProxy = FakeUsercentricsProxy()
val contextMock = mockk<ReactApplicationContext>(relaxed = true)
val module =
Expand All @@ -686,7 +686,33 @@ class RNUsercentricsModuleTest {
}

@Test
fun testShowSecondLayer() {
fun testShowFirstLayerWithNullBannerSettings() {
val usercentricsProxy = FakeUsercentricsProxy()
val contextMock = mockk<ReactApplicationContext>(relaxed = true)
val module =
RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
val promise = FakePromise()
module.showFirstLayer(null, promise)
promise.await()
assertEquals(null, usercentricsProxy.showFirstLayerBannerSettings)
}

@Test
fun testShowFirstLayerWithEmptyBannerSettingsObject() {
val bannerSettings = emptyMap<String, String>().toWritableMap()

val usercentricsProxy = FakeUsercentricsProxy()
val contextMock = mockk<ReactApplicationContext>(relaxed = true)
val module =
RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
val promise = FakePromise()
module.showFirstLayer(bannerSettings, promise)
promise.await()
assertEquals(BannerSettings(), usercentricsProxy.showFirstLayerBannerSettings)
}

@Test
fun testShowSecondLayerWithBannerSettingsObject() {
val usercentricsProxy = FakeUsercentricsProxy()
val contextMock = mockk<ReactApplicationContext>(relaxed = true)
val module =
Expand All @@ -697,6 +723,32 @@ class RNUsercentricsModuleTest {
assertEquals(expectedBannerSettings, usercentricsProxy.showSecondLayerBannerSettings)
}

@Test
fun testShowSecondLayerWithNullBannerSettings() {
val usercentricsProxy = FakeUsercentricsProxy()
val contextMock = mockk<ReactApplicationContext>(relaxed = true)
val module =
RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
val promise = FakePromise()
module.showSecondLayer(null, promise)
promise.await()
assertEquals(null, usercentricsProxy.showSecondLayerBannerSettings)
}

@Test
fun testShowSecondLayerWithEmptyBannerSettingsObject() {
val bannerSettings = emptyMap<String, String>().toWritableMap()

val usercentricsProxy = FakeUsercentricsProxy()
val contextMock = mockk<ReactApplicationContext>(relaxed = true)
val module =
RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
val promise = FakePromise()
module.showSecondLayer(bannerSettings, promise)
promise.await()
assertEquals(BannerSettings(), usercentricsProxy.showSecondLayerBannerSettings)
}

@Test
fun testShowFirstLayerWithCustomLocalLogo() {
val context = InstrumentationRegistry.getInstrumentation().context
Expand Down
4 changes: 2 additions & 2 deletions android/src/main/java/com/usercentrics/reactnativeusercentrics/RNUsercentricsModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ internal class RNUsercentricsModule(
}

@ReactMethod
fun showSecondLayer(options: ReadableMap, promise: Promise) {
fun showSecondLayer(options: ReadableMap?, promise: Promise) {
runOnUiThread {
try {
val context = reactContextProvider.context()
val bannerSettings = options.bannerSettingsFromMap(context)
val bannerSettings = options?.bannerSettingsFromMap(context)

val activity = reactContextProvider.activity()!!
usercentricsProxy.showSecondLayer(activity, bannerSettings, promise)
Expand Down
23 changes: 21 additions & 2 deletions example/ios/exampleTests/RNUsercentricsModuleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ class RNUsercentricsModuleTests: XCTestCase {
XCTAssertEqual(String("variantA"), fakeUsercentrics.variant)
}

func testShowFirstLayer() {
func testShowFirstLayerWithBannerSettingsObject() {
let serializedSettings: NSDictionary = [
"firstLayerStyleSettings": ["layout": "POPUP_CENTER"]
]
Expand All @@ -487,8 +487,17 @@ class RNUsercentricsModuleTests: XCTestCase {
XCTFail("Should not go here")
}
}

func testShowFirstLayerWithEmptyBannerSettingsObject() {
let emptyDictionary: NSDictionary = [:]
module.showFirstLayer(emptyDictionary) { result in
XCTAssertNil(self.fakeUsercentrics.showFirstLayerBannerSettings?.firstLayerStyleSettings)
} reject: { _, _, _ in
XCTFail("Should not go here")
}
}

func testShowSecondLayer() {
func testShowSecondLayerWithBannerSettingsObject() {
let serializedSettings: NSDictionary = [
"secondLayerStyleSettings": ["showCloseButton": true]
]
Expand All @@ -498,6 +507,16 @@ class RNUsercentricsModuleTests: XCTestCase {
XCTFail("Should not go here")
}
}

func testShowSecondLayerWithEmptyBannerSettingsObject() {
let emptyDictionary: NSDictionary = [:]

module.showSecondLayer(emptyDictionary) { result in
XCTAssertNil(self.fakeUsercentrics.showSecondLayerBannerSettings?.secondLayerStyleSettings)
} reject: { _, _, _ in
XCTFail("Should not go here")
}
}

func testTrack() {
module.track(1)
Expand Down
Loading