Updated UT and displaying last updated by correctly

This commit is contained in:
Bing Huan Chio
2015-04-22 18:42:07 -07:00
parent df483c3a8e
commit 0395d33f71
9 changed files with 36 additions and 20 deletions

View File

@@ -138,6 +138,7 @@ namespace Orchard.Core.Tests.Common.Providers {
Filters.Add(new ActivatingFilter<CommonPart>("test-item"));
Filters.Add(new ActivatingFilter<ContentPart<CommonPartVersionRecord>>("test-item"));
Filters.Add(new ActivatingFilter<TestUser>("User"));
Filters.Add(new ActivatingFilter<AlternateTestUser>("AlternateUser"));
}
}
@@ -146,6 +147,11 @@ namespace Orchard.Core.Tests.Common.Providers {
public string UserName { get { return "x"; } }
public string Email { get { return "y"; } }
}
class AlternateTestUser : ContentPart, IUser {
public new int Id { get { return 6655322; } }
public string UserName { get { return "y"; } }
public string Email { get { return "x"; } }
}
[Test]
public void OwnerShouldBeNullAndZeroByDefault() {
@@ -359,14 +365,22 @@ namespace Orchard.Core.Tests.Common.Providers {
public void EditingShouldSetModifiedUtc() {
var contentManager = _container.Resolve<IContentManager>();
var user = contentManager.New<IUser>("User");
_authn.Setup(x => x.GetAuthenticatedUser()).Returns(user);
var createUtc = _clock.UtcNow;
var item = contentManager.Create<ICommonPart>("test-item", VersionOptions.Draft, init => { });
contentManager.Publish(item.ContentItem);
Assert.That(item.CreatedUtc, Is.EqualTo(createUtc));
Assert.That(item.ModifiedUtc, Is.EqualTo(createUtc));
Assert.That(item.VersionModifiedBy, Is.EqualTo(user.UserName));
Assert.That(item.PublishedUtc, Is.EqualTo(createUtc));
// Switch user
var secondUser = contentManager.New<IUser>("AlternateUser");
_authn.Setup(x => x.GetAuthenticatedUser()).Returns(secondUser);
_clock.Advance(TimeSpan.FromMinutes(1));
var editUtc = _clock.UtcNow;
@@ -377,6 +391,7 @@ namespace Orchard.Core.Tests.Common.Providers {
Assert.That(item.ModifiedUtc, Is.EqualTo(editUtc));
Assert.That(item.PublishedUtc, Is.EqualTo(createUtc));
Assert.That(updater.ModelErrors.Count, Is.EqualTo(0));
Assert.That(item.VersionModifiedBy, Is.EqualTo(secondUser.UserName));
}
[Test]

View File

@@ -127,12 +127,12 @@
<ProjectReference Include="..\Orchard.Web\Core\Orchard.Core.csproj">
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
<Private>false</Private>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
<Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
<Name>Orchard.Framework</Name>
<Private>false</Private>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>