Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Default Sitecore 8.2 renderField pipeline -->
<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
<sitecore>
<pipelines>
<renderField>
<processor type="Sitecore.Pipelines.RenderField.SetParameters, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.GetFieldValue, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.GetTextFieldValue, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.ExpandLinks, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.GetImageFieldValue, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.GetLinkFieldValue, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.GetInternalLinkFieldValue, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.GetMemoFieldValue, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.GetDateFieldValue, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.GetDocxFieldValue, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.GetIntegerFieldValue, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.GetNumberFieldValue, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.AddBeforeAndAfterValues, Sitecore.Kernel" />
<processor type="Sitecore.Pipelines.RenderField.RenderWebEditing, Sitecore.Kernel" />
</renderField>
</pipelines>
</sitecore>
</configuration>
1 change: 1 addition & 0 deletions src/Fortis.Tests/Fortis.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@
</None>
<None Include="App_Config\Include\Sitecore.FakeDb.82.config" />
<None Include="App_Config\Include\Sitecore.FakeDb.AutoIncludeSample.config" />
<None Include="App_Config\Include\Sitecore.FakeDb.RenderFieldPipeline.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
Expand Down
20 changes: 16 additions & 4 deletions src/Fortis.Tests/Model/Fields/FieldWrapperTestClass.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
using Fortis.Providers;
using NSubstitute;
using Sitecore.Data;
using Sitecore.Data.Items;
using Sitecore.FakeDb;
using Sitecore.FakeDb.Sites;

namespace Fortis.Tests.Model.Fields
{
Expand All @@ -30,15 +32,25 @@ protected FieldWrapperTestClass()
this.Field = new DbField(FieldName, ID.NewID);
item.Fields.Add(this.Field);
this.Db.Add(item);

// init sitecore context
Sitecore.Context.Site = new FakeSiteContext("website");
Sitecore.Context.Item = this.Item;
}

protected TFieldWrapper FieldWrapper
protected Item Item
{
get { return this.Db.GetItem("/sitecore/content/Test"); }
}

protected TFieldWrapper FieldWrapper
{
get
{
var item = this.Db.GetItem("/sitecore/content/Test");
var field = item.Fields[FieldName];
return (TFieldWrapper) Activator.CreateInstance(typeof (TFieldWrapper), field, this.SpawnProvider);
return (TFieldWrapper) Activator.CreateInstance(
typeof (TFieldWrapper),
this.Item.Fields[FieldName],
this.SpawnProvider);
}
}

Expand Down
26 changes: 12 additions & 14 deletions src/Fortis.Tests/Model/Fields/RichTextFieldWrapperTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,20 @@ namespace Fortis.Tests.Model.Fields
/// <seealso cref="Fortis.Tests.Model.Fields.FieldWrapperTestClass{Fortis.Model.Fields.RichTextFieldWrapper}" />
public class RichTextFieldWrapperTests : FieldWrapperTestClass<RichTextFieldWrapper>
{
//[Theory]
//[InlineData("", "")]
//[InlineData(" ", " ")]
//[InlineData("test", "test")]
//public void Value_SpecificRawValue_ReturnsExpectedHtmlStringValue(string rawValue, string expectedStringValue)
//{
// var expectedValue = new HtmlString(expectedStringValue);
[Theory]
[InlineData("", "")]
[InlineData(" ", " ")]
[InlineData("test", "test")]
public void Value_SpecificRawValue_ReturnsExpectedHtmlStringValue(string rawValue, string expectedValue)
{
this.Field.Value = rawValue;

// this.Field.Value = rawValue;
var actual = this.FieldWrapper.Value;
// Unable to compare two HtmlString objects here, need to compare strings instead.
Assert.Equal(expectedValue, actual.ToHtmlString());
}

// var actual = this.FieldWrapper.Value;

// Assert.Equal(expectedValue, actual);
//}

[Theory]
[Theory]
[InlineData("", false)]
[InlineData(" ", false)]
[InlineData("test", true)]
Expand Down
2 changes: 1 addition & 1 deletion src/Fortis/Model/Fields/IntegerFieldWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public long Value
get
{
InitializeValue();
return _value.Value;
return _value ?? default(long);
}
}

Expand Down
46 changes: 27 additions & 19 deletions src/Fortis/Model/Fields/ListFieldWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,31 +62,39 @@ public IEnumerable<Guid> Value
{
get
{
if (_ids == null)
{
var listField = (MultilistField)Field;
var ids = new List<Guid>();

foreach (var id in listField.Items)
{
Guid guid;

if (Guid.TryParse(id, out guid))
{
ids.Add(guid);
}
}

_ids = ids;
}

this.InitializeValue();
return _ids;
}
}

public override bool HasValue
{
get { return _ids != null && Value.Any(); }
get
{
this.InitializeValue();
return _ids.Any();
}
}

private void InitializeValue()
{
if (_ids == null)
{
var listField = (MultilistField)Field;
var ids = new List<Guid>();

foreach (var id in listField.Items)
{
Guid guid;

if (Guid.TryParse(id, out guid))
{
ids.Add(guid);
}
}

_ids = ids;
}
}
}
}
2 changes: 1 addition & 1 deletion src/Fortis/Model/Fields/NumberFieldWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public float Value
{
this.InitializeValue();

return _value.Value;
return _value ?? default(float);
}
}

Expand Down