Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update development with fixes from v9.4.0-rc #2941

Merged
merged 2 commits into from
Aug 15, 2019
Merged

Update development with fixes from v9.4.0-rc #2941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22e55ea
Fix error running unit tests (#2940)
bdukes Aug 14, 2019
b2d5533
DNN-31366 - Deleted page can still be selected as parent page (#2925)
berkarslan-xo Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions Build/Cake/unit-tests.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Task("EnsureAllProjectsBuilt")
.IsDependentOn("UpdateDnnManifests")
.IsDependentOn("Restore-NuGet-Packages")
.Does(() =>
.Does(() =>
{
MSBuild("DNN_Platform.sln", new MSBuildSettings {
Verbosity = Verbosity.Minimal,
Expand All @@ -13,21 +13,31 @@ Task("EnsureAllProjectsBuilt")

Task("UnitTests")
.IsDependentOn("EnsureAllProjectsBuilt")
.Does(() =>
.Does(() =>
{
var testAssemblies = GetFiles($@"**\bin\{configuration}\DotNetNuke.Tests.*.dll");
testAssemblies -= GetFiles(@"**\DotNetNuke.Tests.Data.dll");
testAssemblies -= GetFiles(@"**\DotNetNuke.Tests.Integration.dll");
testAssemblies -= GetFiles(@"**\DotNetNuke.Tests.Utilities.dll");
testAssemblies -= GetFiles(@"**\DotNetNuke.Tests.Urls.dll");
foreach(var file in testAssemblies) {
VSTest(file.FullPath, new VSTestSettings() {
Logger = $"trx;LogFileName={file.GetFilename()}.xml",
Parallel = true,
EnableCodeCoverage = true,
FrameworkVersion = VSTestFrameworkVersion.NET45,
TestAdapterPath = @"tools\NUnitTestAdapter.2.1.1\tools"
});
foreach (var file in testAssemblies) {
VSTest(file.FullPath, FixToolPath(new VSTestSettings() {
Logger = $"trx;LogFileName={file.GetFilename()}.xml",
Parallel = true,
EnableCodeCoverage = true,
FrameworkVersion = VSTestFrameworkVersion.NET45,
TestAdapterPath = @"tools\NUnitTestAdapter.2.1.1\tools"
}));
}
});

// https://github.com/cake-build/cake/issues/1522
VSTestSettings FixToolPath(VSTestSettings settings)
{
#tool vswhere
settings.ToolPath =
VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.VisualStudio.PackageGroup.TestTools.Core" })
.CombineWithFilePath(File(@"Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"));
return settings;
}
51 changes: 48 additions & 3 deletions DNN Platform/Library/Entities/Tabs/TabController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2473,7 +2473,8 @@ public static List<TabInfo> GetPortalTabs(int portalId, int excludeTabId, bool i
false,
false,
false,
false);
false,
true);
}

/// <summary>
Expand All @@ -2497,7 +2498,8 @@ public static List<TabInfo> GetPortalTabs(int portalId, int excludeTabId, bool i
includeDeleted,
includeURL,
false,
false);
false,
true);
}

/// <summary>
Expand Down Expand Up @@ -2525,7 +2527,8 @@ public static List<TabInfo> GetPortalTabs(int portalId, int excludeTabId, bool i
includeDeleted,
includeURL,
checkViewPermisison,
checkEditPermission);
checkEditPermission,
true);
}

/// <summary>
Expand All @@ -2544,6 +2547,45 @@ public static List<TabInfo> GetPortalTabs(int portalId, int excludeTabId, bool i
public static List<TabInfo> GetPortalTabs(List<TabInfo> tabs, int excludeTabId, bool includeNoneSpecified,
string noneSpecifiedText, bool includeHidden, bool includeDeleted, bool includeURL,
bool checkViewPermisison, bool checkEditPermission)
{
return GetPortalTabs(
tabs,
excludeTabId,
includeNoneSpecified,
noneSpecifiedText,
includeHidden,
includeDeleted,
includeURL,
checkViewPermisison,
checkEditPermission,
true);
}

/// <summary>
/// Gets the portal tabs.
/// </summary>
/// <param name="tabs">The tabs.</param>
/// <param name="excludeTabId">The exclude tab id.</param>
/// <param name="includeNoneSpecified">if set to <c>true</c> [include none specified].</param>
/// <param name="noneSpecifiedText">The none specified text.</param>
/// <param name="includeHidden">if set to <c>true</c> [include hidden].</param>
/// <param name="includeDeleted">if set to <c>true</c> [include deleted].</param>
/// <param name="includeURL">if set to <c>true</c> [include URL].</param>
/// <param name="checkViewPermisison">if set to <c>true</c> [check view permisison].</param>
/// <param name="checkEditPermission">if set to <c>true</c> [check edit permission].</param>
/// <param name="includeDeletedChildren">The value of this parameter affects <see cref="TabInfo.HasChildren"></see> property.</param>
/// <returns></returns>
public static List<TabInfo> GetPortalTabs(
List<TabInfo> tabs,
int excludeTabId,
bool includeNoneSpecified,
string noneSpecifiedText,
bool includeHidden,
bool includeDeleted,
bool includeURL,
bool checkViewPermisison,
bool checkEditPermission,
bool includeDeletedChildren)
{
var listTabs = new List<TabInfo>();
if (includeNoneSpecified)
Expand Down Expand Up @@ -2580,6 +2622,9 @@ public static List<TabInfo> GetPortalTabs(List<TabInfo> tabs, int excludeTabId,
listTabs.Add(tab);
}
}

// HasChildren should be true in case there is at least one not deleted child
tab.HasChildren = tab.HasChildren && (includeDeletedChildren || GetTabsByParent(tab.TabID, tab.PortalID).Any(a => !a.IsDeleted));
}
}
return listTabs;
Expand Down