merge fix

This commit is contained in:
Shannon Deminick
2013-02-21 21:13:21 +06:00
parent 042eb47c17
commit 1aa137e9da

View File

@@ -33,22 +33,6 @@ namespace Umbraco.Tests.PublishedContent
get { return false; }
}
public override void Initialize()
{
base.Initialize();
var routingCtx = GetRoutingContext("/test", 1234);
UmbracoContext.Current = routingCtx.UmbracoContext;
PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(Enumerable.Empty<Type>());
}
public override void TearDown()
{
base.TearDown();
UmbracoContext.Current = null;
PropertyEditorValueConvertersResolver.Reset();
}
protected override string GetXmlContent(int templateId)
{
return @"<?xml version=""1.0"" encoding=""utf-8""?>