More changes

Author: ajaybhargavb

.azure/pipelines/blazor-daily-tests.yml

@@ -8,7 +8,6 @@
 variables:
   SAUCE_CONNECT_DOWNLOAD_ON_INSTALL: true
   E2ETESTS_SauceTest: true
-  E2ETESTS_Sauce__TestName: 'Blazor Daily Tests'
   E2ETESTS_Sauce__TunnelIdentifier: 'blazor-e2e-sc-proxy-tunnel'
   E2ETESTS_Sauce__HostName: 'sauce.local'
 jobs:
@@ -17,9 +16,10 @@ jobs:
     buildDirectory: src/Components
     isTestingJob: true
     agentOs: Windows
-    jobName: BlazorDailyTests_Android_Chrome
+    jobName: BlazorDailyTests
     jobDisplayName: "Blazor Daily Tests"
     afterBuild:
+
     # macOS/Safari
     - script: 'dotnet test --filter "StandaloneAppTest"'
       workingDirectory: 'src/Components/test/E2ETest'
@@ -30,9 +30,12 @@ jobs:
         E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
         E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
         # Set platform/browser configuration.
-        E2ETESTS_Sauce__PlatformName: 'macOS 10.14'
-        E2ETESTS_Sauce__BrowserName: 'safari'
-        E2ETESTS_Sauce__BrowserVersion: 'latest'
+        E2ETESTS_Sauce__TestName: 'Blazor Daily Tests - macOS/Safari'
+        E2ETESTS_Sauce__PlatformName: 'macOS 10.15'
+        E2ETESTS_Sauce__BrowserName: 'Safari'
+        # Need to explicitly set version here because some older versions don't support timeouts in Safari.
+        E2ETESTS_Sauce__SeleniumVersion: '3.4.0'
+
     # Android/Chrome
     - script: 'dotnet test --filter "StandaloneAppTest"'
       workingDirectory: 'src/Components/test/E2ETest'
@@ -43,6 +46,7 @@ jobs:
         E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
         E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
         # Set platform/browser configuration.
+        E2ETESTS_Sauce__TestName: 'Blazor Daily Tests - Android/Chrome'
         E2ETESTS_Sauce__PlatformName: 'Android'
         E2ETESTS_Sauce__PlatformVersion: '10.0'
         E2ETESTS_Sauce__BrowserName: 'Chrome'

src/Shared/E2ETesting/BrowserFixture.cs

@@ -183,17 +183,16 @@ public async Task DisposeAsync()
             capabilities.SetCapability("accessKey", sauce.AccessKey);
             capabilities.SetCapability("tunnelIdentifier", sauce.TunnelIdentifier);
             capabilities.SetCapability("name", name);
-            capabilities.SetCapability("browserName", sauce.BrowserName);
+            capabilities.SetCapability("platformName", sauce.PlatformName);
 
-            if (!string.IsNullOrEmpty(sauce.PlatformVersion))
+            if (!string.IsNullOrEmpty(sauce.BrowserName))
             {
-                capabilities.SetCapability("platformName", sauce.PlatformName);
-                capabilities.SetCapability("platformVersion", sauce.PlatformVersion);
+                capabilities.SetCapability("browserName", sauce.BrowserName);
             }
-            else
+
+            if (!string.IsNullOrEmpty(sauce.PlatformVersion))
             {
-                // In some cases (like macOS), SauceLabs expects us to set "platform" instead of "platformName".
-                capabilities.SetCapability("platform", sauce.PlatformName);
+                capabilities.SetCapability("platformVersion", sauce.PlatformVersion);
             }
 
             if (!string.IsNullOrEmpty(sauce.BrowserVersion))
@@ -216,6 +215,11 @@ public async Task DisposeAsync()
                 capabilities.SetCapability("appiumVersion", sauce.AppiumVersion);
             }
 
+            if (!string.IsNullOrEmpty(sauce.SeleniumVersion))
+            {
+                capabilities.SetCapability("seleniumVersion", sauce.SeleniumVersion);
+            }
+
             await SauceConnectServer.StartAsync(output);
 
             var attempt = 0;
@@ -244,7 +248,7 @@ public async Task DisposeAsync()
 
             } while (attempt < maxAttempts);
 
-            throw new InvalidOperationException("Couldn't create a SauceLabs remote driver client. The server is irresponsive");
+            throw new InvalidOperationException("Couldn't create a SauceLabs remote driver client.");
         }
     }
 }

src/Shared/E2ETesting/SauceOptions.cs

@@ -15,6 +15,8 @@ public class SauceOptions
 
         public string TestName { get; set; }
 
+        public bool IsRealDevice { get; set; }
+
         public string PlatformName { get; set; }
 
         public string PlatformVersion { get; set; }
@@ -28,5 +30,7 @@ public class SauceOptions
         public string DeviceOrientation { get; set; }
 
         public string AppiumVersion { get; set; }
+
+        public string SeleniumVersion { get; set; }
     }
-}
+}