Small changes

This commit is contained in:
Jamie Rees 2020-05-04 23:05:51 +01:00
commit 7a9d22e43c
6 changed files with 73 additions and 69 deletions

View file

@ -1,7 +0,0 @@
language: csharp
solution: src/Ombi.sln
install:
- mono Tools/nuget.exe restore Ombi.sln
- nuget install NUnit.Runners -OutputDirectory testrunner
script:
- xbuild /p:Configuration=Release Ombi.sln /p:TargetFrameworkVersion="v4.5"

View file

@ -2,16 +2,21 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoFixture" Version="4.5.0" /> <PackageReference Include="AutoFixture" Version="4.11.0" />
<PackageReference Include="Moq" Version="4.10.0" /> <PackageReference Include="Moq" Version="4.14.1" />
<PackageReference Include="Nunit" Version="3.11.0" /> <PackageReference Include="Nunit" Version="3.12.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.9.0" /> <PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
<packagereference Include="Microsoft.NET.Test.Sdk" Version="16.0.1"></packagereference> <packagereference Include="Microsoft.NET.Test.Sdk" Version="16.6.1"></packagereference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View file

@ -70,7 +70,7 @@ namespace Ombi.Core.Tests.Rule.Search
var result = await Rule.Execute(search); var result = await Rule.Execute(search);
Assert.True(result.Success); Assert.True(result.Success);
Assert.That(search.EmbyUrl, Is.EqualTo("http://test.com/#!/item/item.html?id=1")); Assert.That(search.EmbyUrl, Is.EqualTo("http://test.com/#!/item.html?id=1"));
} }
[Test] [Test]
@ -99,7 +99,7 @@ namespace Ombi.Core.Tests.Rule.Search
var result = await Rule.Execute(search); var result = await Rule.Execute(search);
Assert.True(result.Success); Assert.True(result.Success);
Assert.That(search.EmbyUrl, Is.EqualTo("https://app.emby.media/#!/item/item.html?id=1")); Assert.That(search.EmbyUrl, Is.EqualTo("https://app.emby.media/#!/item.html?id=1"));
} }
[Test] [Test]

View file

@ -113,7 +113,7 @@ namespace Ombi.Core.Tests.Rule.Search
PercentOfTracks = 100 PercentOfTracks = 100
} }
}.AsQueryable()); }.AsQueryable());
var request = new SearchAlbumViewModel { ForeignAlbumId = "ABC" }; var request = new SearchAlbumViewModel { ForeignAlbumId = "abc" };
var result = await Rule.Execute(request); var result = await Rule.Execute(request);
Assert.True(result.Success); Assert.True(result.Success);

View file

@ -63,7 +63,7 @@ namespace Ombi.Core.Tests.Rule.Search
ForeignArtistId = "abc", ForeignArtistId = "abc",
} }
}.AsQueryable()); }.AsQueryable());
var request = new SearchArtistViewModel { ForignArtistId = "ABC" }; var request = new SearchArtistViewModel { ForignArtistId = "abc" };
var result = await Rule.Execute(request); var result = await Rule.Execute(request);
Assert.True(result.Success); Assert.True(result.Success);

View file

@ -3,8 +3,7 @@
<head> <head>
<script type='text/javascript'> <script type='text/javascript'>
function configExists(url) {
function configExists(url) {
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
req.open('GET', url, false); req.open('GET', url, false);
req.send(); req.send();
@ -35,7 +34,7 @@ function configExists(url) {
document.write("<base href='" + (configFound ? basePath : '/') + "' />"); document.write("<base href='" + (configFound ? basePath : '/') + "' />");
console.log(window["baseHref"]); console.log(window["baseHref"]);
</script> </script>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
<link href="styles/please-wait.css" rel="stylesheet"> <link href="styles/please-wait.css" rel="stylesheet">
@ -44,6 +43,13 @@ function configExists(url) {
<script src="styles/please-wait.js"></script> <script src="styles/please-wait.js"></script>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta property="og:image:height" content="375" />
<meta property="og:image:width" content="991" />
<meta property="og:image" content="~/images/logo.png" />
<meta property="og:site_name" content="Ombi" />
<meta property="og:title" content="Ombi" />
<meta property="og:type" content="website" />
<meta property="og:description" content="Ombi, media request tool">
<title>Ombi</title> <title>Ombi</title>
@ -53,7 +59,7 @@ function configExists(url) {
<app-ombi> <app-ombi>
<script type="text/javascript"> <script type="text/javascript">
var colors = ["#f44336","#f44336","#9c27b0","#673ab7","#3f51b5","#2196f3","#03a9f4","#00bcd4","#009688","#4caf50","#cddc39","#ffeb3b","#ffc107","#ff9800","#ff5722","#9e9e9e","#607d8b"]; var colors = ["#f44336", "#f44336", "#9c27b0", "#673ab7", "#3f51b5", "#2196f3", "#03a9f4", "#00bcd4", "#009688", "#4caf50", "#cddc39", "#ffeb3b", "#ffc107", "#ff9800", "#ff5722", "#9e9e9e", "#607d8b"];
var bgColor = colors[Math.floor(Math.random() * colors.length)]; var bgColor = colors[Math.floor(Math.random() * colors.length)];
window.loading_screen = window.pleaseWait({ window.loading_screen = window.pleaseWait({
// logo: "assets/images/logo.png", // logo: "assets/images/logo.png",