Merge pull request #5441 from woocommerce/ea/fix-settings-tests

ealeksandrov · web-flow · commit 1f95fdb6b41a · 2021-11-16T19:09:55.000+03:00
Fix site URL comparison failure in UI tests
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift
@@ -72,7 +72,8 @@ final class SettingsViewModel: SettingsViewModelOutput, SettingsViewModelActions
     /// Main Site's URL
     ///
     var siteUrl: String? {
-        stores.sessionManager.defaultSite?.url as String?
+        let urlString = stores.sessionManager.defaultSite?.url as String?
+        return urlString?.removingPrefix("https://").removingPrefix("http://")
     }
 
     /// Sites pulled from the results controlelr

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ final class SettingsViewModel: SettingsViewModelOutput, SettingsViewModelActions`
`72`	`72`	`/// Main Site's URL`
`73`	`73`	`///`
`74`	`74`	`var siteUrl: String? {`
`75`		`- stores.sessionManager.defaultSite?.url as String?`
	`75`	`+ let urlString = stores.sessionManager.defaultSite?.url as String?`
	`76`	`+ return urlString?.removingPrefix("https://").removingPrefix("http://")`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`/// Sites pulled from the results controlelr`