update yml

Author: ajaybhargavb

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

@@ -4,24 +4,68 @@
 # Daily Tests for Blazor
 # These use Sauce Labs resources, hence they run daily rather than per-commit.
 
-# The only Daily Tests we have run in Sauce Labs and only need to run on one machine (because they just trigger SauceLabs)
-# Hence we use the 'default-build.yml' template because it represents a single phase
+# We just need one Windows machine because all it does is trigger SauceLabs.
 variables:
+  SAUCE_CONNECT_DOWNLOAD_ON_INSTALL: true
   E2ETESTS_SauceTest: true
-  E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
-  E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
+  E2ETESTS_Sauce__TestName: 'Blazor Daily Tests'
   E2ETESTS_Sauce__TunnelIdentifier: 'blazor-e2e-sc-proxy-tunnel'
   E2ETESTS_Sauce__HostName: 'sauce.local'
 jobs:
 - template: jobs/default-build.yml
   parameters:
     buildDirectory: src/Components
-    buildArgs: -test
     isTestingJob: true
     agentOs: Windows
-    jobName: BlazorDailyTests
+    jobName: BlazorDailyTests_Android_Chrome
     jobDisplayName: "Blazor Daily Tests"
+    afterBuild:
+    # macOS/Safari
+    - script: 'dotnet test --filter "StandaloneAppTest"'
+      workingDirectory: 'src/Components/test/E2ETest'
+      displayName: 'Run Blazor tests - macOS/Safari'
+      condition: succeededOrFailed()
+      env:
+        # Secrets need to be explicitly mapped to env variables.
+        E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
+        E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
+        # Set platform/browser configuration.
+        E2ETESTS_Sauce__PlatformName: 'macOS'
+        E2ETESTS_Sauce__PlatformVersion: '10.14'
+        E2ETESTS_Sauce__BrowserName: 'Safari'
+        E2ETESTS_Sauce__BrowserVersion: 'latest'
+    # Android/Chrome
+    - script: 'dotnet test --filter "StandaloneAppTest"'
+      workingDirectory: 'src/Components/test/E2ETest'
+      displayName: 'Run Blazor tests - Android/Chrome'
+      condition: succeededOrFailed()
+      env:
+        # Secrets need to be explicitly mapped to env variables.
+        E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
+        E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
+        # Set platform/browser configuration.
+        E2ETESTS_Sauce__PlatformName: 'Android'
+        E2ETESTS_Sauce__PlatformVersion: '10.0'
+        E2ETESTS_Sauce__BrowserName: 'Chrome'
+        E2ETESTS_Sauce__DeviceName: 'Android GoogleAPI Emulator'
+        E2ETESTS_Sauce__DeviceOrientation: 'portrait'
+        E2ETESTS_Sauce__AppiumVersion: '1.9.1'
+    # iOS/Safari
+    - script: 'dotnet test --filter "StandaloneAppTest"'
+      workingDirectory: 'src/Components/test/E2ETest'
+      displayName: 'Run Blazor tests - iOS/Safari'
+      condition: succeededOrFailed()
+      env:
+        # Secrets need to be explicitly mapped to env variables.
+        E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
+        E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
+        # Set platform/browser configuration.
+        E2ETESTS_Sauce__PlatformName: 'iOS'
+        E2ETESTS_Sauce__PlatformVersion: '13.0'
+        E2ETESTS_Sauce__BrowserName: 'Safari'
+        E2ETESTS_Sauce__DeviceName: 'iPhone 11'
+        E2ETESTS_Sauce__DeviceOrientation: 'portrait'
     artifacts:
     - name: Windows_Logs
       path: ../../artifacts/log/
-      publishOnError: true
+      publishOnError: true

src/Shared/E2ETesting/BrowserFixture.cs

@@ -157,21 +157,59 @@ public async Task DisposeAsync()
 
         private async Task<(IWebDriver browser, ILogs log)> CreateSauceBrowserAsync(string context, ITestOutputHelper output)
         {
-            var name = "Blazor E2E tests";
+            var sauce = E2ETestOptions.Instance.Sauce;
+
+            if (sauce == null ||
+                string.IsNullOrEmpty(sauce.TestName) ||
+                string.IsNullOrEmpty(sauce.Username) ||
+                string.IsNullOrEmpty(sauce.AccessKey) ||
+                string.IsNullOrEmpty(sauce.TunnelIdentifier) ||
+                string.IsNullOrEmpty(sauce.PlatformName) ||
+                string.IsNullOrEmpty(sauce.BrowserName))
+            {
+                throw new InvalidOperationException("Required SauceLabs environment variables not set.");
+            }
+
+            var name = sauce.TestName;
             if (!string.IsNullOrEmpty(context))
             {
                 name = $"{name} - {context}";
             }
 
             var capabilities = new DesiredCapabilities();
-            capabilities.SetCapability("username", E2ETestOptions.Instance.Sauce.Username);
-            capabilities.SetCapability("accessKey", E2ETestOptions.Instance.Sauce.AccessKey);
-            capabilities.SetCapability("tunnelIdentifier", E2ETestOptions.Instance.Sauce.TunnelIdentifier);
+
+            // Required config
+            capabilities.SetCapability("username", sauce.Username);
+            capabilities.SetCapability("accessKey", sauce.AccessKey);
+            capabilities.SetCapability("tunnelIdentifier", sauce.TunnelIdentifier);
             capabilities.SetCapability("name", name);
+            capabilities.SetCapability("platformName", sauce.PlatformName);
+            capabilities.SetCapability("browserName", sauce.BrowserName);
+
+            if (!string.IsNullOrEmpty(sauce.BrowserVersion))
+            {
+                capabilities.SetCapability("browserVersion", sauce.BrowserVersion);
+            }
 
-            capabilities.SetCapability("browserName", "Chrome");
-            capabilities.SetCapability("platform", "macOS 10.13");
-            capabilities.SetCapability("version", "latest");
+            if (!string.IsNullOrEmpty(sauce.PlatformVersion))
+            {
+                capabilities.SetCapability("platformVersion", sauce.PlatformVersion);
+            }
+
+            if (!string.IsNullOrEmpty(sauce.DeviceName))
+            {
+                capabilities.SetCapability("deviceName", sauce.DeviceName);
+            }
+
+            if (!string.IsNullOrEmpty(sauce.DeviceOrientation))
+            {
+                capabilities.SetCapability("deviceOrientation", sauce.DeviceOrientation);
+            }
+
+            if (!string.IsNullOrEmpty(sauce.AppiumVersion))
+            {
+                capabilities.SetCapability("appiumVersion", sauce.AppiumVersion);
+            }
 
             await SauceConnectServer.StartAsync(output);
 
@@ -201,7 +239,7 @@ public async Task DisposeAsync()
 
             } while (attempt < maxAttempts);
 
-            throw new InvalidOperationException("Couldn't create a Selenium remote driver client. The server is irresponsive");
+            throw new InvalidOperationException("Couldn't create a SauceLabs remote driver client. The server is irresponsive");
         }
     }
 }

src/Shared/E2ETesting/E2ETestOptions.cs

@@ -57,19 +57,8 @@ static E2ETestOptions()
 
         public double DefaultAfterFailureWaitTimeoutInSeconds { get; set; } = 3;
 
-        public bool SauceTest { get; set; } = false;
+        public bool SauceTest { get; set; }
 
         public SauceOptions Sauce { get; set; }
-
-        public class SauceOptions
-        {
-            public string Username { get; set; }
-
-            public string AccessKey { get; set; }
-
-            public string TunnelIdentifier { get; set; }
-
-            public string HostName { get; set; }
-        }
     }
 }

src/Shared/E2ETesting/SauceConnectServer.cs

@@ -28,8 +28,8 @@ public class SauceConnectServer : IDisposable
         private Process _sentinelProcess;
         private static IMessageSink _diagnosticsMessageSink;
 
-        // 1h 30 min
-        private static int SauceConnectProcessTimeout = 3600;
+        // 2h
+        private static int SauceConnectProcessTimeout = 7200;
 
         public SauceConnectServer(IMessageSink diagnosticsMessageSink)
         {

src/Shared/E2ETesting/SauceOptions.cs

@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.E2ETesting
+{
+    public class SauceOptions
+    {
+        public string Username { get; set; }
+
+        public string AccessKey { get; set; }
+
+        public string TunnelIdentifier { get; set; }
+
+        public string HostName { get; set; }
+
+        public string TestName { get; set; }
+
+        public string PlatformName { get; set; }
+
+        public string PlatformVersion { get; set; }
+
+        public string BrowserName { get; set; }
+
+        public string BrowserVersion { get; set; }
+
+        public string DeviceName { get; set; }
+
+        public string DeviceOrientation { get; set; }
+
+        public string AppiumVersion { get; set; }
+    }
+}