mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-04-21 01:24:44 +01:00
Backport pull request #11743 from jellyfin/release-10.9.z
Fix replace logic
Original-merge: 2ddb15c784
Merged-by: joshuaboniface <joshua@boniface.me>
Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
committed by
Joshua M. Boniface
parent
c0364fc766
commit
5d4880c497
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using MediaBrowser.Controller.Entities;
|
||||
using MediaBrowser.Controller.Entities.Audio;
|
||||
using MediaBrowser.Controller.Entities.Movies;
|
||||
@@ -19,7 +20,7 @@ namespace Jellyfin.Providers.Tests.Manager
|
||||
[InlineData(true, true)]
|
||||
public void MergeBaseItemData_MergeMetadataSettings_MergesWhenSet(bool mergeMetadataSettings, bool defaultDate)
|
||||
{
|
||||
var newLocked = new[] { MetadataField.Cast };
|
||||
var newLocked = new[] { MetadataField.Genres, MetadataField.Cast };
|
||||
var newString = "new";
|
||||
var newDate = DateTime.Now;
|
||||
|
||||
@@ -77,7 +78,7 @@ namespace Jellyfin.Providers.Tests.Manager
|
||||
|
||||
[Theory]
|
||||
[InlineData("Name", MetadataField.Name, false)]
|
||||
[InlineData("OriginalTitle", null, false)]
|
||||
[InlineData("OriginalTitle", null)]
|
||||
[InlineData("OfficialRating", MetadataField.OfficialRating)]
|
||||
[InlineData("CustomRating")]
|
||||
[InlineData("Tagline")]
|
||||
|
||||
Reference in New Issue
Block a user