Merge pull request #2674 from AzureAD/release/2.3.0

Release/2.3.0

Author: juan-arias

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [2.3.0]
+* Fix automation tests (#2673)
+
 ## [2.2.0]
 * Make native auth MFA feature more backward compatible (#2645)
 

MSAL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "2.2.0"
+  s.version      = "2.3.0"
   s.summary      = "Microsoft Authentication Library (MSAL) for iOS"
   s.description  = <<-DESC
                    The MSAL library for iOS gives your app the ability to begin using the Microsoft Cloud by supporting Microsoft Azure Active Directory and Microsoft Accounts in a converged experience using industry standard OAuth2 and OpenID Connect. The library also supports Microsoft Azure B2C for those using our hosted identity management service.

MSAL/IdentityCore

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

MSAL/resources/ios/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

MSAL/resources/mac/Info.plist

@@ -26,7 +26,7 @@
 //------------------------------------------------------------------------------
 
 #define MSAL_VER_HIGH       2
-#define MSAL_VER_LOW        2
+#define MSAL_VER_LOW        3
 #define MSAL_VER_PATCH      0
 
 #define STR_HELPER(x) #x

MSAL/src/MSAL_Internal.h

@@ -175,12 +175,22 @@ - (void)acceptConsentIfNecessary:(XCUIElement *)elementToCheck
 
     while (i < 20) {
         sleep(1);
-        // If consent button found, tap it and return
+        // Check if title exists
         if (elementToCheck.exists)
         {
             XCUIElement *button = self.testApp.buttons[consentButton];
-            [button msidTap];
-            return;
+            // If consent button found, tap it and return
+            if (button.exists)
+            {
+                [button msidTap];
+                return;
+            }
+            else
+            {
+                // The title is there, but consent button not found. Return and continue.
+                // Depending on the test, will try with another consent button.
+                return;
+            }
         }
         // If consent button is not there, but system webview is still shown, wait for 1 more second
         else if ([self.testApp.buttons[@"URL"] exists] && !embeddedWebView)

MSAL/test/automation/tests/MSALBaseUITest.m

@@ -97,7 +97,12 @@ - (NSString *)runSharedB2CMSALoginWithRequest:(MSIDAutomationTestRequest *)reque
 
     // Get pass Verify your email screen and use password to login instead
     [self acceptConsentIfNecessary:self.testApp.staticTexts[@"Verify your email"]
-                     consentButton:@"Other ways to sign in"
+                     consentButton:@"Use your password instead"
+                   embeddedWebView:NO];
+    
+    // Sometimes there is another Verify your email screen, but with a different button title (A/B testing?)
+    [self acceptConsentIfNecessary:self.testApp.staticTexts[@"Verify your email"]
+                     consentButton:@"Use your password"
                    embeddedWebView:NO];
 
     if (shouldEnterPassword) [self aadEnterPassword:self.testApp];;