From 58a0de086f4417a2352cc9ea9ef319dd41f85383 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Oct 2014 17:07:27 +1000
Subject: [PATCH] fixes unit test

---
 src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs | 5 +++++
 src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs  | 1 +
 src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs b/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs
index c3699b545f..0711f0a866 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs
@@ -17,12 +17,14 @@ namespace Umbraco.Web.Models.Mapping
         {
             config.CreateMap<UmbracoEntity, EntityBasic>()
                 .ForMember(basic => basic.Icon, expression => expression.MapFrom(entity => entity.ContentTypeIcon))
+                .ForMember(dto => dto.Trashed, expression => expression.Ignore())
                 .ForMember(x => x.Alias, expression => expression.Ignore());
 
             config.CreateMap<PropertyType, EntityBasic>()
                 .ForMember(basic => basic.Icon, expression => expression.UseValue("icon-box"))
                 .ForMember(basic => basic.Path, expression => expression.UseValue(""))
                 .ForMember(basic => basic.ParentId, expression => expression.UseValue(-1))
+                .ForMember(dto => dto.Trashed, expression => expression.Ignore())
                 .ForMember(x => x.AdditionalData, expression => expression.Ignore());
 
             config.CreateMap<PropertyGroup, EntityBasic>()
@@ -31,6 +33,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(basic => basic.ParentId, expression => expression.UseValue(-1))
                 //in v6 the 'alias' is it's lower cased name so we'll stick to that.
                 .ForMember(basic => basic.Alias, expression => expression.MapFrom(group => group.Name.ToLowerInvariant()))
+                .ForMember(dto => dto.Trashed, expression => expression.Ignore())
                 .ForMember(x => x.AdditionalData, expression => expression.Ignore());
 
             config.CreateMap<IUser, EntityBasic>()
@@ -38,6 +41,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(basic => basic.Path, expression => expression.UseValue(""))
                 .ForMember(basic => basic.ParentId, expression => expression.UseValue(-1))
                 .ForMember(basic => basic.Alias, expression => expression.MapFrom(user => user.Username))
+                .ForMember(dto => dto.Trashed, expression => expression.Ignore())
                 .ForMember(x => x.AdditionalData, expression => expression.Ignore());
 
             config.CreateMap<SearchResult, EntityBasic>()
@@ -49,6 +53,7 @@ namespace Umbraco.Web.Models.Mapping
                   .ForMember(x => x.ParentId, expression => expression.Ignore())
                   .ForMember(x => x.Alias, expression => expression.Ignore())
                   .ForMember(x => x.Path, expression => expression.Ignore())
+                  .ForMember(dto => dto.Trashed, expression => expression.Ignore())
                   .ForMember(x => x.AdditionalData, expression => expression.Ignore())
                   .AfterMap((result, basic) =>
                       {
diff --git a/src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs
index 35db17654d..54ebca6e68 100644
--- a/src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs
@@ -23,6 +23,7 @@ namespace Umbraco.Web.Models.Mapping
                   .ForMember(entityBasic => entityBasic.Icon, expression => expression.UseValue("icon-settings-alt"))
                   .ForMember(dto => dto.ParentId, expression => expression.UseValue(-1))
                   .ForMember(dto => dto.Path, expression => expression.ResolveUsing(macro => "-1," + macro.Id))
+                  .ForMember(dto => dto.Trashed, expression => expression.Ignore())
                   .ForMember(dto => dto.AdditionalData, expression => expression.Ignore());
 
             config.CreateMap<IMacro, IEnumerable<MacroParameter>>()
diff --git a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
index 2cfd9073a8..a1b544228a 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
@@ -140,6 +140,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(member => member.AdditionalData, expression => expression.Ignore())
                 .ForMember(x => x.Published, expression => expression.Ignore())
                 .ForMember(x => x.Updater, expression => expression.Ignore())
+                .ForMember(dto => dto.Trashed, expression => expression.Ignore())
                 .ForMember(x => x.Alias, expression => expression.Ignore())
                 .ForMember(x => x.ContentTypeAlias, expression => expression.Ignore());