Skip to content

Commit 6199031

Browse files
committed
DRY test site URL value in AuthenticationManagerTests.swift
1 parent cc0e7bd commit 6199031

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

WooCommerce/WooCommerceTests/Authentication/AuthenticationManagerTests.swift

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import Yosemite
66

77
/// Test cases for `AuthenticationManager`.
88
final class AuthenticationManagerTests: XCTestCase {
9+
10+
let testSiteURL = "http://test.com"
11+
912
/// We do not allow automatic WPCOM account sign-up if the user entered an email that is not
1013
/// registered in WordPress.com. This configuration is set up in
1114
/// `WordPressAuthenticatorConfiguration` in `AuthenticationManager.initialize()`.
@@ -158,15 +161,14 @@ final class AuthenticationManagerTests: XCTestCase {
158161
func test_it_shows_error_upon_login_epilogue_if_the_self_hosted_site_does_not_have_jetpack() {
159162
// Given
160163
let manager = AuthenticationManager()
161-
let testSite = "http://test.com"
162-
let siteInfo = siteInfo(url: testSite,
164+
let siteInfo = siteInfo(url: testSiteURL,
163165
exists: true,
164166
hasWordPress: true,
165167
isWordPressCom: false,
166168
hasJetpack: false,
167169
isJetpackActive: false,
168170
isJetpackConnected: false)
169-
let wpcomCredentials = WordPressComCredentials(authToken: "abc", isJetpackLogin: false, multifactor: false, siteURL: testSite)
171+
let wpcomCredentials = WordPressComCredentials(authToken: "abc", isJetpackLogin: false, multifactor: false, siteURL: testSiteURL)
170172
let credentials = AuthenticatorCredentials(wpcom: wpcomCredentials, wporg: nil)
171173
let navigationController = UINavigationController()
172174

@@ -185,15 +187,14 @@ final class AuthenticationManagerTests: XCTestCase {
185187
func test_it_shows_account_mismatch_upon_login_epilogue_if_the_site_has_active_jetpack_but_not_connected() {
186188
// Given
187189
let manager = AuthenticationManager()
188-
let testSite = "http://test.com"
189-
let siteInfo = siteInfo(url: testSite,
190+
let siteInfo = siteInfo(url: testSiteURL,
190191
exists: true,
191192
hasWordPress: true,
192193
isWordPressCom: false,
193194
hasJetpack: true,
194195
isJetpackActive: true,
195196
isJetpackConnected: false)
196-
let wpcomCredentials = WordPressComCredentials(authToken: "abc", isJetpackLogin: false, multifactor: false, siteURL: testSite)
197+
let wpcomCredentials = WordPressComCredentials(authToken: "abc", isJetpackLogin: false, multifactor: false, siteURL: testSiteURL)
197198
let credentials = AuthenticatorCredentials(wpcom: wpcomCredentials, wporg: nil)
198199
let navigationController = UINavigationController()
199200

@@ -209,8 +210,7 @@ final class AuthenticationManagerTests: XCTestCase {
209210
func test_it_can_display_jetpack_error_for_org_site_credentials_sign_in() {
210211
// Given
211212
let manager = AuthenticationManager()
212-
let testSite = "http://test.com"
213-
let siteInfo = WordPressComSiteInfo(remote: ["isWordPress": true, "hasJetpack": false, "urlAfterRedirects": testSite])
213+
let siteInfo = WordPressComSiteInfo(remote: ["isWordPress": true, "hasJetpack": false, "urlAfterRedirects": testSiteURL])
214214
let wporgCredentials = WordPressOrgCredentials(username: "cba", password: "password", xmlrpc: "http://test.com/xmlrpc.php", options: [:])
215215
let credentials = AuthenticatorCredentials(wpcom: nil, wporg: wporgCredentials)
216216
let navigationController = UINavigationController()
@@ -227,15 +227,14 @@ final class AuthenticationManagerTests: XCTestCase {
227227
func test_errorViewController_display_account_mismatch_screen_if_no_site_matches_the_given_self_hosted_site() {
228228
// Given
229229
let manager = AuthenticationManager()
230-
let testSite = "http://test.com"
231230
let navigationController = UINavigationController()
232231
let storage = MockStorageManager()
233232
let matcher = ULAccountMatcher(storageManager: storage)
234233
let wporgCredentials = WordPressOrgCredentials(username: "test", password: "pwd", xmlrpc: "http://test.com/xmlrpc.php", options: [:])
235234
let credentials = AuthenticatorCredentials(wpcom: nil, wporg: wporgCredentials)
236235

237236
// When
238-
let controller = manager.errorViewController(for: testSite, with: matcher, credentials: credentials, navigationController: navigationController) {}
237+
let controller = manager.errorViewController(for: testSiteURL, with: matcher, credentials: credentials, navigationController: navigationController) {}
239238

240239
// Then
241240
XCTAssertNotNil(controller)
@@ -245,13 +244,12 @@ final class AuthenticationManagerTests: XCTestCase {
245244
func test_errorViewController_returns_account_mismatch_if_no_site_matches_the_given_url() {
246245
// Given
247246
let manager = AuthenticationManager()
248-
let testSite = "http://test.com"
249247
let navigationController = UINavigationController()
250248
let storage = MockStorageManager()
251249
let matcher = ULAccountMatcher(storageManager: storage)
252250

253251
// When
254-
let controller = manager.errorViewController(for: testSite, with: matcher, navigationController: navigationController) {}
252+
let controller = manager.errorViewController(for: testSiteURL, with: matcher, navigationController: navigationController) {}
255253

256254
// Then
257255
XCTAssertNotNil(controller)
@@ -263,7 +261,6 @@ final class AuthenticationManagerTests: XCTestCase {
263261
let manager = AuthenticationManager()
264262
let navigationController = UINavigationController()
265263

266-
let testSiteURL = "http://test.com"
267264
let testSite = Site.fake().copy(siteID: 1234, name: "Test", url: testSiteURL, isWooCommerceActive: false)
268265

269266
let storage = MockStorageManager()
@@ -284,7 +281,6 @@ final class AuthenticationManagerTests: XCTestCase {
284281
let manager = AuthenticationManager()
285282
let navigationController = UINavigationController()
286283

287-
let testSiteURL = "http://test.com"
288284
let testSite = Site.fake().copy(siteID: 1234, name: "Test", url: testSiteURL, isWooCommerceActive: true)
289285

290286
let storage = MockStorageManager()
@@ -303,7 +299,6 @@ final class AuthenticationManagerTests: XCTestCase {
303299
// Given
304300
let navigationController = UINavigationController()
305301

306-
let testSiteURL = "http://test.com"
307302
let testSite = Site.fake().copy(siteID: 1234, name: "Test", url: testSiteURL, isWooCommerceActive: false) // No Woo
308303

309304
let storage = MockStorageManager()
@@ -326,7 +321,6 @@ final class AuthenticationManagerTests: XCTestCase {
326321
// Given
327322
let navigationController = UINavigationController()
328323

329-
let testSiteURL = "http://test.com"
330324
let testSite = Site.fake().copy(siteID: 1234, name: "Test", url: testSiteURL, isWooCommerceActive: true)
331325

332326
let storage = MockStorageManager()

0 commit comments

Comments
 (0)