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

Fixed the model mapping tests

Browse Source
This commit is contained in:
Shannon
2013-11-15 17:15:59 +11:00
parent 2bd91d619d
commit 94cc49e67e
4 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Configuration/UmbracoSettings/SecurityElement.cs
View File

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
return new OptionalInnerTextConfigurationElement<bool>(
(InnerTextConfigurationElement<bool>)this["keepUserLoggedIn"],
//set the default
false);
true);
}
}

2
src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
View File

@@ -8,7 +8,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
[Test]
public void KeepUserLoggedIn()
{
Assert.IsTrue(SettingsSection.Security.KeepUserLoggedIn == false);
Assert.IsTrue(SettingsSection.Security.KeepUserLoggedIn == true);
}
[Test]
public void HideDisabledUsersInBackoffice()

12
src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
View File

@@ -30,13 +30,13 @@ namespace Umbraco.Tests.Models.Mapping
get { return DatabaseBehavior.NewSchemaPerFixture; }
}
protected override void FreezeResolution()
{
//PropertyEditorResolver.Current = new PropertyEditorResolver(
// () => new List<Type> {typeof (TestPropertyEditor)});
//protected override void FreezeResolution()
//{
// PropertyEditorResolver.Current = new PropertyEditorResolver(
// () => PluginManager.Current.ResolvePropertyEditors());
base.FreezeResolution();
}
// base.FreezeResolution();
//}
[Test]
public void To_Media_Item_Simple()

15
src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
View File

@@ -80,18 +80,9 @@ namespace Umbraco.Tests.TestHelpers
using (DisposableTimer.TraceDuration<BaseDatabaseFactoryTest>("init"))
{
using (DisposableTimer.TraceDuration<BaseDatabaseFactoryTest>("DatabaseContext.Initialize"))
{
DatabaseContext.Initialize(dbFactory.ProviderName, dbFactory.ConnectionString);
}
using (DisposableTimer.TraceDuration<BaseDatabaseFactoryTest>("CreateSqlCeDatabase"))
{
CreateSqlCeDatabase();
}
using (DisposableTimer.TraceDuration<BaseDatabaseFactoryTest>("InitializeDatabase"))
{
InitializeDatabase();
}
DatabaseContext.Initialize(dbFactory.ProviderName, dbFactory.ConnectionString);
CreateSqlCeDatabase();
InitializeDatabase();
//ensure the configuration matches the current version for tests
SettingsForTests.ConfigurationStatus = UmbracoVersion.Current.ToString(3);