Update meta

ajaybhargavb · ajaybhargavb · commit df74243f9473 · 2020-01-23T14:14:51.000-08:00
diff --git a/.azure/pipelines/blazor-daily-tests.yml b/.azure/pipelines/blazor-daily-tests.yml
@@ -30,9 +30,8 @@ jobs:
         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__PlatformName: 'macOS 10.14'
+        E2ETESTS_Sauce__BrowserName: 'safari'
         E2ETESTS_Sauce__BrowserVersion: 'latest'
     # Android/Chrome
     - script: 'dotnet test --filter "StandaloneAppTest"'
@@ -50,21 +49,6 @@ jobs:
         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/
diff --git a/src/Components/Blazor/testassets/StandaloneApp/wwwroot/index.html b/src/Components/Blazor/testassets/StandaloneApp/wwwroot/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width">
+    <meta name="viewport" content="width=1024">
     <title>Blazor standalone</title>
     <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
diff --git a/src/Shared/E2ETesting/BrowserFixture.cs b/src/Shared/E2ETesting/BrowserFixture.cs
@@ -183,17 +183,22 @@ public async Task DisposeAsync()
             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))
+            if (!string.IsNullOrEmpty(sauce.PlatformVersion))
             {
-                capabilities.SetCapability("browserVersion", sauce.BrowserVersion);
+                capabilities.SetCapability("platformName", sauce.PlatformName);
+                capabilities.SetCapability("platformVersion", sauce.PlatformVersion);
+            }
+            else
+            {
+                // In some cases (like macOS), SauceLabs expects us to set "platform" instead of "platformName".
+                capabilities.SetCapability("platform", sauce.PlatformName);
             }
 
-            if (!string.IsNullOrEmpty(sauce.PlatformVersion))
+            if (!string.IsNullOrEmpty(sauce.BrowserVersion))
             {
-                capabilities.SetCapability("platformVersion", sauce.PlatformVersion);
+                capabilities.SetCapability("browserVersion", sauce.BrowserVersion);
             }
 
             if (!string.IsNullOrEmpty(sauce.DeviceName))
