Skip to content

Commit 5f02976

Browse files
committed
Merge branch 'googlepay-mail-address' into 'master'
Googlepay mail address See merge request pace/mobile/android/pace-cloud-sdk!370
2 parents 3792961 + 6dd7bd9 commit 5f02976

File tree

2 files changed

+26
-11
lines changed

2 files changed

+26
-11
lines changed

library/src/main/java/cloud/pace/sdk/appkit/communication/generated/model/request/GooglePayPaymentRequest.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ public data class GooglePayPaymentRequest(
1919
* Information about the merchant that requests payment data.
2020
*/
2121
public val merchantInfo: MerchantInfo?,
22+
/**
23+
* Set to true to request an email address to be provided in the payment response
24+
*/
25+
public val emailRequired: Boolean?,
2226
/**
2327
* Specifies support for one or more payment methods supported by the Google Pay API.
2428
*/

library/src/test/java/cloud/pace/sdk/appkit/AppActivityViewModelTest.kt

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import org.mockito.junit.MockitoJUnitRunner
3737
@OptIn(ExperimentalCoroutinesApi::class)
3838
@RunWith(MockitoJUnitRunner::class)
3939
class AppActivityViewModelTest : KoinTest {
40-
4140
@get:Rule
4241
var coroutineTestRule = CoroutineTestRule()
4342

@@ -48,15 +47,16 @@ class AppActivityViewModelTest : KoinTest {
4847
private val appModel = AppModelImpl(mockContext, coroutineTestRule.testDispatcherProvider)
4948
private val viewModel: AppActivityViewModel by inject()
5049

51-
private val testModule = module {
52-
single<AppModel> {
53-
appModel
54-
}
50+
private val testModule =
51+
module {
52+
single<AppModel> {
53+
appModel
54+
}
5555

56-
viewModel<AppActivityViewModel> {
57-
AppActivityViewModelImpl(get())
56+
viewModel<AppActivityViewModel> {
57+
AppActivityViewModelImpl(get())
58+
}
5859
}
59-
}
6060

6161
@Before
6262
fun init() {
@@ -111,7 +111,12 @@ class AppActivityViewModelTest : KoinTest {
111111
viewModel.authorize.observeForever(observer)
112112

113113
appModel.authorize(onResult)
114-
assertEquals(onResult, viewModel.authorize.value?.peekContent()?.onResult)
114+
assertEquals(
115+
onResult,
116+
viewModel.authorize.value
117+
?.peekContent()
118+
?.onResult,
119+
)
115120

116121
viewModel.authorize.removeObserver(observer)
117122
}
@@ -124,7 +129,12 @@ class AppActivityViewModelTest : KoinTest {
124129
viewModel.endSession.observeForever(observer)
125130

126131
appModel.endSession(onResult)
127-
assertEquals(onResult, viewModel.endSession.value?.peekContent()?.onResult)
132+
assertEquals(
133+
onResult,
134+
viewModel.endSession.value
135+
?.peekContent()
136+
?.onResult,
137+
)
128138

129139
viewModel.endSession.removeObserver(observer)
130140
}
@@ -146,7 +156,8 @@ class AppActivityViewModelTest : KoinTest {
146156
@Test
147157
fun `google pay payment is requested`() {
148158
val onResult: (Completion<GooglePayPaymentResponse>) -> Unit = {}
149-
val googlePayPaymentRequest = GooglePayPaymentRequest(2, 0, null, listOf(), mockk())
159+
val googlePayPaymentRequest =
160+
GooglePayPaymentRequest(apiVersion = 2, apiVersionMinor = 0, merchantInfo = null, emailRequired = true, allowedPaymentMethods = listOf(), transactionInfo = mockk())
150161

151162
val observer = Observer<Event<Pair<GooglePayPaymentRequest, (Completion<GooglePayPaymentResponse>) -> Unit>>> {}
152163
viewModel.googlePayPayment.observeForever(observer)

0 commit comments

Comments
 (0)