Improvements to the UI and also finished the availability checker #865 #1464

This commit is contained in:
Jamie.Rees 2017-08-25 14:06:47 +01:00
commit 3cc45b3022
30 changed files with 317 additions and 126 deletions

View file

@ -5,10 +5,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="Moq" Version="4.7.10" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="xunit" Version="2.3.0-beta4-build3742" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta4-build3742" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta4-build3742" />
</ItemGroup>
<ItemGroup>

View file

@ -26,8 +26,8 @@ namespace Ombi.Core.Tests.Rule.Request
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.Movie };
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, true);
Assert.True(result.Success);
Assert.True(request.Approved);
}
[Fact]
@ -37,8 +37,8 @@ namespace Ombi.Core.Tests.Rule.Request
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.TvShow };
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, true);
Assert.True(result.Success);
Assert.True(request.Approved);
}
[Fact]
@ -48,8 +48,8 @@ namespace Ombi.Core.Tests.Rule.Request
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.Movie };
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, true);
Assert.True(result.Success);
Assert.True(request.Approved);
}
[Fact]
@ -59,8 +59,8 @@ namespace Ombi.Core.Tests.Rule.Request
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.TvShow };
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, true);
Assert.True(result.Success);
Assert.True(request.Approved);
}
[Fact]
@ -69,8 +69,8 @@ namespace Ombi.Core.Tests.Rule.Request
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.Movie };
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, false);
Assert.True(result.Success);
Assert.False(request.Approved);
}
[Fact]
@ -79,8 +79,8 @@ namespace Ombi.Core.Tests.Rule.Request
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.TvShow };
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, false);
Assert.True(result.Success);
Assert.False(request.Approved);
}
}
}

View file

@ -33,7 +33,7 @@ namespace Ombi.Core.Tests.Rule.Search
Approved = true
};
MovieMock.Setup(x => x.GetRequest(123)).ReturnsAsync(list);
MovieMock.Setup(x => x.GetRequest(123)).Returns(list);
var search = new SearchMovieViewModel
{
Id = 123,
@ -42,7 +42,7 @@ namespace Ombi.Core.Tests.Rule.Search
var result = await Rule.Execute(search);
Assert.True(result.Success);
Assert.Equal(search.Approved, true);
Assert.False(search.Approved);
}
[Fact]
@ -54,7 +54,7 @@ namespace Ombi.Core.Tests.Rule.Search
Approved = true
};
MovieMock.Setup(x => x.GetRequest(123)).ReturnsAsync(list);
MovieMock.Setup(x => x.GetRequest(123)).Returns(list);
var search = new SearchMovieViewModel
{
Id = 999,
@ -63,7 +63,7 @@ namespace Ombi.Core.Tests.Rule.Search
var result = await Rule.Execute(search);
Assert.True(result.Success);
Assert.Equal(search.Approved, false);
Assert.False(search.Approved);
}
[Fact]
@ -82,7 +82,7 @@ namespace Ombi.Core.Tests.Rule.Search
}
};
TvMock.Setup(x => x.GetRequest(123)).ReturnsAsync(list);
TvMock.Setup(x => x.GetRequest(123)).Returns(list);
var search = new SearchTvShowViewModel
{
Id = 123,
@ -91,7 +91,7 @@ namespace Ombi.Core.Tests.Rule.Search
var result = await Rule.Execute(search);
Assert.True(result.Success);
Assert.Equal(search.Approved, true);
Assert.True(search.Approved);
}
[Fact]
@ -111,7 +111,7 @@ namespace Ombi.Core.Tests.Rule.Search
};
TvMock.Setup(x => x.GetRequest(123)).ReturnsAsync(list);
TvMock.Setup(x => x.GetRequest(123)).Returns(list);
var search = new SearchTvShowViewModel()
{
Id = 999,
@ -120,7 +120,7 @@ namespace Ombi.Core.Tests.Rule.Search
var result = await Rule.Execute(search);
Assert.True(result.Success);
Assert.Equal(search.Approved, false);
Assert.False(search.Approved);
}