Fixing tests (#1182)

* For  #6652 - Follow up fix XCUITests after FxA navigation bar change (#6683)

* fix more tests


Co-authored-by: isabelrios <[email protected]>

Author: chrmod

Client/Frontend/Browser/BrowserViewController.swift

@@ -144,7 +144,6 @@ class BrowserViewController: UIViewController {
     let downloadQueue = DownloadQueue()
     var isCmdClickForNewTab = false
 
-
     init(profile: Profile, tabManager: TabManager) {
         self.profile = profile
         self.tabManager = tabManager
@@ -1308,7 +1307,7 @@ class BrowserViewController: UIViewController {
         case url
         case finishedNavigation
     }
-    
+
     func navigateInTab(tab: Tab, to navigation: WKNavigation? = nil, webViewStatus: WebViewUpdateStatus) {
         tabManager.expireSnackbars()
 
@@ -1330,7 +1329,7 @@ class BrowserViewController: UIViewController {
 
             TabEvent.post(.didChangeURL(url), for: tab)
         }
-        
+
         // Represents WebView observation or delegate update that called this function
         switch webViewStatus {
         case .title, .url, .finishedNavigation:
@@ -1341,7 +1340,7 @@ class BrowserViewController: UIViewController {
                 // This is kind of a hacky fix for Bug 1476637 to prevent webpages from focusing the
                 // touch-screen keyboard from the background even though they shouldn't be able to.
                 webView.resignFirstResponder()
-                
+
                 // We need a better way of identifying when webviews are finished rendering
                 // There are cases in which the page will still show a loading animation or nothing when the screenshot is being taken,
                 // depending on internet connection
@@ -2211,13 +2210,13 @@ extension BrowserViewController: ContextMenuHelperDelegate {
             self.displayedPopoverController = nil
         }
     }
-    
+
     //Support for CMD+ Click on link to open in a new tab
      override func pressesBegan(_ presses: Set<UIPress>, with event: UIPressesEvent?) {
          guard let key = presses.first?.key, (key.keyCode == .keyboardLeftGUI || key.keyCode == .keyboardRightGUI) else { return } //GUI buttons = CMD buttons on ipad/mac
          self.isCmdClickForNewTab = true
     }
-    
+
     override func pressesEnded(_ presses: Set<UIPress>, with event: UIPressesEvent?) {
         guard let key = presses.first?.key, (key.keyCode == .keyboardLeftGUI || key.keyCode == .keyboardRightGUI) else { return }
         self.isCmdClickForNewTab = false

Client/Frontend/Browser/BrowserViewController/BrowserViewController+WebViewDelegates.swift

@@ -560,7 +560,7 @@ extension BrowserViewController: WKNavigationDelegate {
 
             tab.mimeType = response.mimeType
         }
-        
+
         if isCmdClickForNewTab {
             guard let url = webView.url, let isPrivate = self.tabManager.selectedTab?.isPrivate else { return }
             homePanelDidRequestToOpenInNewTab(url, isPrivate: isPrivate)

Client/Frontend/Browser/DownloadQueue.swift

@@ -77,7 +77,7 @@ class HTTPDownload: Download {
     init?(preflightResponse: URLResponse, request: URLRequest) {
         self.preflightResponse = preflightResponse
         self.request = request
-        
+
         // Verify scheme is a secure http or https scheme before moving forward with HTTPDownload initialization
         guard let scheme = request.url?.scheme, (scheme == "http" || scheme == "https") else {
             return nil

Client/Frontend/Browser/LoginsHelper.swift

@@ -69,7 +69,7 @@ class LoginsHelper: TabContentScript {
         var dict: [String: Any] = [
             "hostname": origin,
             "username": username,
-            "password": password
+            "password": password,
         ]
 
         if let string = script["formSubmitURL"] as? String,
@@ -266,7 +266,7 @@ class LoginsHelper: TabContentScript {
             let dict: [String: Any] = [
                 "requestId": requestId,
                 "name": "RemoteLogins:loginsFound",
-                "logins": logins
+                "logins": logins,
             ]
 
             let json = JSON(dict)

Client/Frontend/Browser/ScreenshotHelper.swift

@@ -17,7 +17,7 @@ class ScreenshotHelper {
     init(controller: BrowserViewController) {
         self.controller = controller
     }
-    
+
     /// Takes a screenshot of the WebView to be displayed on the tab view page
     /**
      If taking a screenshot of the home page, uses our custom screenshot `UIView` extension function

Client/Frontend/Browser/Tab.swift

@@ -739,14 +739,14 @@ class TabWebView: WKWebView, MenuHelperInterface {
 
         return super.hitTest(point, with: event)
     }
-    
+
     /// Override evaluateJavascript - should not be called directly on TabWebViews any longer
     // We should only be calling evaluateJavascriptInDefaultContentWorld in the future
     @available(*, unavailable, message:"Do not call evaluateJavaScript directly on TabWebViews, should only be called on super class")
     override func evaluateJavaScript(_ javaScriptString: String, completionHandler: ((Any?, Error?) -> Void)? = nil) {
         super.evaluateJavaScript(javaScriptString, completionHandler: completionHandler)
     }
-    
+
 }
 
 ///

Client/Frontend/Browser/TabManager.swift

@@ -506,7 +506,6 @@ class TabManager: NSObject {
         tabs.remove(at: removalIndex)
         assert(count == prevCount - 1, "Make sure the tab count was actually removed")
 
-
         if tab.isPrivate && privateTabs.count < 1 {
             privateConfiguration = TabManager.makeWebViewConfig(isPrivate: true, prefs: profile.prefs)
         }

Client/Frontend/Browser/TabTrayControllerV1.swift

@@ -135,7 +135,6 @@ class TabTrayControllerV1: UIViewController {
         collectionView.dragDelegate = tabDisplayManager
         collectionView.dropDelegate = tabDisplayManager
 
-
         [webViewContainerBackdrop, collectionView, toolbar].forEach { view.addSubview($0) }
 
         makeConstraints()
@@ -185,11 +184,11 @@ class TabTrayControllerV1: UIViewController {
     }
 
     fileprivate func makeConstraints() {
-        
+
         webViewContainerBackdrop.snp.makeConstraints { make in
             make.edges.equalTo(self.view)
         }
-        
+
         collectionView.snp.makeConstraints { make in
             make.left.equalTo(view.safeArea.left)
             make.right.equalTo(view.safeArea.right)