yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge dev-v7.6 into dev-v8

Browse Source
This commit is contained in:
Stephan
2016-12-14 14:06:30 +01:00
parent 04066e901f 4863052a08
commit 07a05317ff
44 changed files with 1067 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
View File

@@ -482,7 +482,7 @@ namespace Umbraco.Tests.Persistence.Repositories
try
{
DatabaseContext.Database.EnableSqlTrace = true;
DatabaseContext.Database.EnableSqlCount();
DatabaseContext.Database.EnableSqlCount = true;
var result = repository.GetPagedResultsByQuery(query, 0, 2, out totalRecords, "title", Direction.Ascending, false);
@@ -496,7 +496,7 @@ namespace Umbraco.Tests.Persistence.Repositories
finally
{
DatabaseContext.Database.EnableSqlTrace = false;
DatabaseContext.Database.DisableSqlCount();
DatabaseContext.Database.EnableSqlCount = false;
}
}
}
@@ -517,7 +517,7 @@ namespace Umbraco.Tests.Persistence.Repositories
try
{
DatabaseContext.Database.EnableSqlTrace = true;
DatabaseContext.Database.EnableSqlCount();
DatabaseContext.Database.EnableSqlCount = true;
var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "Name", Direction.Ascending, true);
// Assert
@@ -528,7 +528,7 @@ namespace Umbraco.Tests.Persistence.Repositories
finally
{
DatabaseContext.Database.EnableSqlTrace = false;
DatabaseContext.Database.DisableSqlCount();
DatabaseContext.Database.EnableSqlCount = false;
}
}
}