@@ -67,24 +67,9 @@ final class NotWPAccountViewModelTests: XCTestCase {
6767 XCTAssertEqual ( auxiliaryButtonTitle, AuthenticationConstants . whatIsWPComLinkTitle)
6868 }
6969
70- func test_viewmodel_provides_expected_title_for_primary_button_when_simplified_login_feature_flag_is_off ( ) {
70+ func test_viewmodel_provides_expected_title_for_primary_button ( ) {
7171 // Given
72- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: false )
73- let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
74- featureFlagService: featureFlagService)
75-
76- // When
77- let primaryButtonTitle = viewModel. primaryButtonTitle
78-
79- // Then
80- XCTAssertEqual ( primaryButtonTitle, Expectations . loginWithSiteAddressTitle)
81- }
82-
83- func test_viewmodel_provides_expected_title_for_primary_button_when_simplified_login_feature_flag_is_on( ) {
84- // Given
85- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: true )
86- let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
87- featureFlagService: featureFlagService)
72+ let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) )
8873 // When
8974 let primaryButtonTitle = viewModel. primaryButtonTitle
9075
@@ -105,23 +90,9 @@ final class NotWPAccountViewModelTests: XCTestCase {
10590 XCTAssertEqual ( primaryButtonTitle, Expectations . restartLoginTitle)
10691 }
10792
108- func test_primary_button_title_is_login_with_site_address_for_invalidWPComEmail_from_wpCom_error_when_simplified_login_feature_flag_is_off( ) {
109- // Given
110- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: false )
111- let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
112- featureFlagService: featureFlagService)
113- // When
114- let primaryButtonTitle = viewModel. primaryButtonTitle
115-
116- // Then
117- XCTAssertEqual ( primaryButtonTitle, Expectations . loginWithSiteAddressTitle)
118- }
119-
120- func test_primary_button_title_is_create_an_account_for_invalidWPComEmail_from_wpCom_error_when_simplified_login_feature_flag_is_on( ) {
93+ func test_primary_button_title_is_create_an_account_for_invalidWPComEmail_from_wpCom_error( ) {
12194 // Given
122- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: true )
123- let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
124- featureFlagService: featureFlagService)
95+ let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) )
12596 // When
12697 let primaryButtonTitle = viewModel. primaryButtonTitle
12798
@@ -139,29 +110,18 @@ final class NotWPAccountViewModelTests: XCTestCase {
139110 XCTAssertFalse ( viewModel. isPrimaryButtonHidden)
140111 }
141112
142- func test_primary_button_is_not_hidden_for_invalidWPComEmail_from_wpCom_error_when_simplified_login_feature_flag_is_off ( ) {
113+ func test_primary_button_is_not_hidden_for_invalidWPComEmail_from_wpCom_error_when_store_creation_is_on ( ) {
143114 // Given
144- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled : false )
115+ let featureFlagService = MockFeatureFlagService ( isStoreCreationMVPEnabled : true )
145116 let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
146117 featureFlagService: featureFlagService)
147118 // Then
148119 XCTAssertFalse ( viewModel. isPrimaryButtonHidden)
149120 }
150121
151- func test_primary_button_is_not_hidden_for_invalidWPComEmail_from_wpCom_error_when_simplified_login_is_on_and_store_creation_is_on ( ) {
122+ func test_primary_button_is_hidden_for_invalidWPComEmail_from_wpCom_error_when_store_creation_is_off ( ) {
152123 // Given
153- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: true ,
154- isStoreCreationMVPEnabled: true )
155- let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
156- featureFlagService: featureFlagService)
157- // Then
158- XCTAssertFalse ( viewModel. isPrimaryButtonHidden)
159- }
160-
161- func test_primary_button_is_hidden_for_invalidWPComEmail_from_wpCom_error_when_simplified_login_is_on_and_store_creation_is_off( ) {
162- // Given
163- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: true ,
164- isStoreCreationMVPEnabled: false )
124+ let featureFlagService = MockFeatureFlagService ( isStoreCreationMVPEnabled: false )
165125 let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
166126 featureFlagService: featureFlagService)
167127 // Then
@@ -188,24 +148,9 @@ final class NotWPAccountViewModelTests: XCTestCase {
188148
189149 // MARK: - `secondaryButtonTitle`
190150
191- func test_viewmodel_provides_expected_title_for_secondary_button_when_simplified_login_feature_flag_is_off( ) {
192- // Given
193- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: false )
194- let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
195- featureFlagService: featureFlagService)
196-
197- // When
198- let secondaryButtonTitle = viewModel. secondaryButtonTitle
199-
200- // Then
201- XCTAssertEqual ( secondaryButtonTitle, Expectations . restartLoginTitle)
202- }
203-
204- func test_viewmodel_provides_expected_title_for_secondary_button_when_simplified_login_feature_flag_is_on( ) {
151+ func test_viewmodel_provides_expected_title_for_secondary_button( ) {
205152 // Given
206- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: true )
207- let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
208- featureFlagService: featureFlagService)
153+ let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) )
209154 // When
210155 let secondaryButtonTitle = viewModel. secondaryButtonTitle
211156
@@ -232,10 +177,8 @@ final class NotWPAccountViewModelTests: XCTestCase {
232177
233178 func test_tapping_auxiliary_button_tracks_what__is_wordpress_com_event( ) {
234179 // Given
235- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: true )
236180 let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
237- analytics: analytics,
238- featureFlagService: featureFlagService)
181+ analytics: analytics)
239182
240183 // When
241184 viewModel. didTapAuxiliaryButton ( in: nil )
@@ -244,26 +187,10 @@ final class NotWPAccountViewModelTests: XCTestCase {
244187 XCTAssertNotNil ( analyticsProvider. receivedEvents. first ( where: { $0 == " what_is_wordpress_com_on_invalid_email_screen " } ) )
245188 }
246189
247- func test_tapping_primary_button_does_not_track_create_account_event_when_simplified_login_feature_flag_is_off ( ) {
190+ func test_tapping_primary_button_tracks_create_account_event ( ) {
248191 // Given
249- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: false )
250192 let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
251- analytics: analytics,
252- featureFlagService: featureFlagService)
253-
254- // When
255- viewModel. didTapPrimaryButton ( in: nil )
256-
257- // Then
258- XCTAssertNil ( analyticsProvider. receivedEvents. first ( where: { $0 == " create_account_on_invalid_email_screen " } ) )
259- }
260-
261- func test_tapping_primary_button_tracks_create_account_event_when_simplified_login_feature_flag_is_on( ) {
262- // Given
263- let featureFlagService = MockFeatureFlagService ( isSimplifiedLoginFlowI1Enabled: true )
264- let viewModel = NotWPAccountViewModel ( error: SignInError . invalidWPComEmail ( source: . wpCom) ,
265- analytics: analytics,
266- featureFlagService: featureFlagService)
193+ analytics: analytics)
267194
268195 // When
269196 viewModel. didTapPrimaryButton ( in: nil )
0 commit comments