Feature/ci fix

CalSmokeApp/CalSmokeApp/CalAppDelegate.m

@@ -250,7 +250,7 @@ - (NSString *)simulatorPreferencesPath:(NSString *) aIgnore {
 
     // 4. and unescape spaces, if necessary (i.e. in the simulator)
     NSString *unsanitizedPlistPath = [plistRootPath stringByAppendingPathComponent:relativePlistPath];
-    path = [[unsanitizedPlistPath stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] copy];
+    path = [[unsanitizedPlistPath stringByRemovingPercentEncoding] copy];
   });
   NSLog(@"sim pref path = %@", path);
   return path;

CalSmokeApp/CalSmokeApp/CalDragDropController.m

@@ -199,15 +199,15 @@ - (IBAction)buttonTouchedShowAlert:(id)sender {
                                     @"The title of the default button on the Smoke Test alert.");
   NSString *lcancel = NSLocalizedString(@"Cancel",
                                         @"The title of the cancel button on the Smoke Test alert.");
-
-  UIAlertView *alert = [[UIAlertView alloc]
-                        initWithTitle:lat
-                        message:lam
-                        delegate:self
-                        cancelButtonTitle:lcancel
-                        otherButtonTitles:lok, nil];
-  alert.accessibilityIdentifier = @"alert";
-  [alert show];
+  UIAlertController *alert = [UIAlertController alertControllerWithTitle:lat message:lam preferredStyle:UIAlertControllerStyleAlert];
+  [alert addAction:[UIAlertAction actionWithTitle:lcancel
+                                            style:UIAlertActionStyleCancel
+                                          handler:^(UIAlertAction *action) {}]];
+  [alert addAction:[UIAlertAction actionWithTitle:lok
+                                            style:UIAlertActionStyleDefault
+                                          handler:^(UIAlertAction *action) {}]];
+  alert.view.accessibilityIdentifier = @"alert";
+  [self presentViewController:alert animated:YES completion:nil];
 }
 
 - (IBAction)buttonToucheShowSheet:(id)sender {
@@ -217,26 +217,37 @@ - (IBAction)buttonToucheShowSheet:(id)sender {
                                           @"The title of the cancel button on the Smoke Test sheet.");
   NSString *locDelete = NSLocalizedString(@"Delete",
                                           @"The title of the delete button on the Smoke Test sheet.");
+  UIAlertController *sheet = [UIAlertController alertControllerWithTitle:locTitle
+                                                                 message:nil
+                                                          preferredStyle:UIAlertControllerStyleActionSheet];
 
-  UIActionSheet *sheet = nil;
   if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-    sheet = [[UIActionSheet alloc]
-             initWithTitle:locTitle
-             delegate:self
-             cancelButtonTitle:nil
-             destructiveButtonTitle:locDelete
-             otherButtonTitles:locCancel, nil];
+    [sheet addAction:[UIAlertAction actionWithTitle:locDelete
+                                              style:UIAlertActionStyleDestructive
+                                            handler:^(UIAlertAction *action) {}]];
+    [sheet addAction:[UIAlertAction actionWithTitle:locCancel
+                                              style:UIAlertActionStyleDefault
+                                            handler:^(UIAlertAction *action) {}]];
+
+    [sheet setModalPresentationStyle:UIModalPresentationPopover];
+
+    UIButton *button = sender;
+    UIPopoverPresentationController *popPresenter = [sheet
+                                                  popoverPresentationController];
+    popPresenter.sourceView = button;
+    popPresenter.sourceRect = button.bounds;
+
   } else {
-    sheet = [[UIActionSheet alloc]
-             initWithTitle:locTitle
-             delegate:self
-             cancelButtonTitle:locCancel
-             destructiveButtonTitle:locDelete
-             otherButtonTitles:nil];
+    [sheet addAction:[UIAlertAction actionWithTitle:locDelete
+                                              style:UIAlertActionStyleDestructive
+                                            handler:^(UIAlertAction *action) {}]];
+    [sheet addAction:[UIAlertAction actionWithTitle:locCancel
+                                              style:UIAlertActionStyleCancel
+                                            handler:^(UIAlertAction *action) {}]];
   }
 
-  sheet.accessibilityIdentifier = @"sheet";
-  [sheet showFromTabBar:self.tabBarController.tabBar];
+  sheet.view.accessibilityIdentifier = @"sheet";
+  [self.tabBarController presentViewController:sheet animated:YES completion:nil];
 }
 
 - (IBAction) buttonTouchedShowOpenGL:(id) sender {
@@ -251,17 +262,6 @@ - (IBAction) buttonTouchedShowOpenGL:(id) sender {
                    }];
 }
 
-#pragma mark - Alert View Delegate
-
-- (void) alertView:(UIAlertView *) aAlertView clickedButtonAtIndex:(NSInteger) aIndex {
-}
-
-#pragma mark - Action Sheet Delegate
-
-- (void) actionSheet:(UIActionSheet *) aActionSheet clickedButtonAtIndex:(NSInteger) aButtonIndex {
-
-}
-
 #pragma mark - Animations
 
 - (void) animateOrangeViewForSeconds:(NSTimeInterval)seconds {

CalSmokeApp/CalSmokeApp/Fingertips/MBFingerTipWindow.m

@@ -251,6 +251,12 @@ - (void)sendEvent:(UIEvent *)event
                     [self removeFingerTipWithHash:touch.hash animated:YES];
                     break;
                 }
+                case UITouchPhaseRegionEntered:
+                case UITouchPhaseRegionMoved:
+                case UITouchPhaseRegionExited:
+                default: {
+                    break;
+                }
             }
         }
     }

CalSmokeApp/CalSmokeApp/ScrollControllers/CalCollectionViewController.m

@@ -428,7 +428,13 @@ - (void)viewWillAppear:(BOOL)animated {
   self.navigationItem.hidesBackButton = YES;
   self.navigationItem.backBarButtonItem = nil;
   self.navigationItem.leftBarButtonItem = backButton;
-
+
+  //added for iOS >= 13.
+  //Since iOS 13 swipe back gesture should start out of a screen border, so tests stopped working
+  UISwipeGestureRecognizer* swipeLeftToRight = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(buttonTouchedBack:)];
+  swipeLeftToRight.direction = UISwipeGestureRecognizerDirectionRight;
+  [self.view addGestureRecognizer:swipeLeftToRight];
+
   UINavigationController *navcon = self.navigationController;
   if ([navcon respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
     navcon.interactivePopGestureRecognizer.enabled = YES;

CalSmokeApp/CalSmokeApp/ScrollControllers/CalTableViewContoller.m

@@ -263,6 +263,12 @@ - (void)viewWillAppear:(BOOL)animated {
   self.navigationItem.backBarButtonItem = nil;
   self.navigationItem.leftBarButtonItem = backButton;
 
+  //added for iOS >= 13.
+  //Since iOS 13 swipe back gesture should start out of a screen border, so tests stopped working
+  UISwipeGestureRecognizer* swipeLeftToRight = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(buttonTouchedBack:)];
+  swipeLeftToRight.direction = UISwipeGestureRecognizerDirectionRight;
+  [self.view addGestureRecognizer:swipeLeftToRight];
+
   UINavigationController *navcon = self.navigationController;
   if ([navcon respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
     navcon.interactivePopGestureRecognizer.enabled = YES;

CalSmokeApp/CalSmokeApp/en.lproj/CalTableViewContoller.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13770" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13770"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

CalSmokeApp/Gemfile

@@ -8,7 +8,7 @@ gem "json", "2.6.1"
 # workflow and build tools
 gem 'retriable', "2.0.2"
 gem 'rake', "13.0.6"
-gem 'bundler', "2.3.13"
+gem 'bundler', "2.3.16"
 gem 'xcpretty', "0.3.0"
 gem "xamarin-test-cloud", "2.3.0"
 gem 'rspec', "3.11.0"