Merge pull request #30 from martincostello/Fix-Schema

Fix schema

Author: martincostello

src/MartinCostello.BrowserStack.Automate/BrowserStackAutomateClient.cs

@@ -329,7 +329,11 @@ public virtual async Task<ICollection<Build>> GetBuildsAsync(
                 using (var response = await Client.SendAsync(request, cancellationToken).ConfigureAwait(false))
                 {
                     await EnsureSuccessAsync(response).ConfigureAwait(false);
-                    return await DeserializeAsync<List<Build>>(response).ConfigureAwait(false);
+                    var builds = await DeserializeAsync<List<AutomationBuild>>(response).ConfigureAwait(false);
+
+                    return builds
+                        .Select((p) => p.Build)
+                        .ToList();
                 }
             }
         }
@@ -403,7 +407,9 @@ public virtual async Task<SessionDetail> GetSessionAsync(string sessionId, Cance
                 using (var response = await Client.SendAsync(request, cancellationToken).ConfigureAwait(false))
                 {
                     await EnsureSuccessAsync(response).ConfigureAwait(false);
-                    return await DeserializeAsync<SessionDetail>(response).ConfigureAwait(false);
+                    var result = await DeserializeAsync<AutomationSessionDetail>(response).ConfigureAwait(false);
+
+                    return result?.SessionDetail;
                 }
             }
         }
@@ -523,7 +529,11 @@ public virtual async Task<ICollection<Session>> GetSessionsAsync(
                 using (var response = await Client.SendAsync(request, cancellationToken).ConfigureAwait(false))
                 {
                     await EnsureSuccessAsync(response).ConfigureAwait(false);
-                    return await DeserializeAsync<List<Session>>(response).ConfigureAwait(false);
+                    var sessions = await DeserializeAsync<List<AutomationSession>>(response).ConfigureAwait(false);
+
+                    return sessions
+                        .Select((p) => p.Session)
+                        .ToList();
                 }
             }
         }
@@ -708,7 +718,9 @@ public virtual async Task<Session> SetSessionStatusAsync(
                 using (var response = await Client.SendAsync(request, cancellationToken).ConfigureAwait(false))
                 {
                     await EnsureSuccessAsync(response).ConfigureAwait(false);
-                    return await DeserializeAsync<Session>(response).ConfigureAwait(false);
+                    var session = await DeserializeAsync<AutomationSession>(response).ConfigureAwait(false);
+
+                    return session?.Session;
                 }
             }
         }
@@ -942,5 +954,41 @@ private async Task<T> SetNameAsync<T>(
                 }
             }
         }
+
+        /// <summary>
+        /// A class representing a BrowserStack Automate build. This class cannot be inherited.
+        /// </summary>
+        private sealed class AutomationBuild
+        {
+            /// <summary>
+            /// Gets or sets the build.
+            /// </summary>
+            [JsonProperty("automation_build")]
+            public Build Build { get; set; }
+        }
+
+        /// <summary>
+        /// A class representing a BrowserStack Automate session. This class cannot be inherited.
+        /// </summary>
+        private sealed class AutomationSession
+        {
+            /// <summary>
+            /// Gets or sets the session.
+            /// </summary>
+            [JsonProperty("automation_session")]
+            public Session Session { get; set; }
+        }
+
+        /// <summary>
+        /// A class representing a BrowserStack Automate session's details. This class cannot be inherited.
+        /// </summary>
+        private sealed class AutomationSessionDetail
+        {
+            /// <summary>
+            /// Gets or sets the session.
+            /// </summary>
+            [JsonProperty("automation_session")]
+            public SessionDetail SessionDetail { get; set; }
+        }
     }
 }

src/MartinCostello.BrowserStack.Automate/Session.cs

@@ -26,7 +26,7 @@ public class Session : IBrowserInfo
         /// <summary>
         /// Gets or sets the duration of the session in seconds.
         /// </summary>
-        [JsonProperty("duration")]
+        [JsonProperty("duration", NullValueHandling = NullValueHandling.Ignore)] // TODO Should be nullable, but don't want to break binary compatibility
         public int Duration { get; set; }
 
         /// <summary>

tests/MartinCostello.BrowserStack.Automate.Tests/BrowserStackAutomateClientTests.cs

@@ -978,7 +978,7 @@ private static void AssertSession(Session session, string expectedName)
             session.ProjectName.Should().NotBeNullOrEmpty();
             session.Reason.Should().NotBeNullOrEmpty();
             session.Status.Should().NotBeNullOrEmpty();
-            session.Duration.Should().BeGreaterThan(0);
+            session.Duration.Should().BeGreaterThan(-1);
         }
 
         /// <summary>