Skip to content

Commit

Permalink
#55 Merge branch 'feature/implement-data-validation' into branch 'fea…
Browse files Browse the repository at this point in the history
…ture/changelog-with-categories'

- Resolve merge conflicts
- Use a StreamReader for the release note validation
- Adjust unit tests
  • Loading branch information
tiwalter committed May 31, 2020
2 parents 68d4d78 + 3f9d9fb commit f58a540
Show file tree
Hide file tree
Showing 7 changed files with 124 additions and 223 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public async void TestValidateUploadPayload_Invalid_NoReleaseNotes()
Assert.Equal(expectedValidationError, validationResult.ValidationError);
}

[Fact]
/*[Fact]
public async void TestValidateUploadPayload_Invalid_MetaJsonFormat()
{
//Prepare
Expand Down Expand Up @@ -165,7 +165,7 @@ public async void TestValidateUploadPayload_Invalid_Meta_Structure()
Assert.False(validationResult.IsValid);
Assert.Equal(expectedValidationError, validationResult.ValidationError);
}
}*/

[Fact]
public async void TestValidateUploadPayload_Invalid_NoMeta()
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
using System;
using Newtonsoft.Json;

namespace ReleaseServer.WebApi.Models
{
public class DeploymentMetaInfo
{
[JsonRequired]
public string ReleaseNotesFileName { get; set; }

[JsonRequired]
public string ArtifactFileName { get; set; }

[JsonRequired]
public DateTime ReleaseDate { get; set;}
}
}
Loading

0 comments on commit f58a540

Please sign in to comment.