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

fixes test

Browse Source
This commit is contained in:
Shannon
2017-05-29 17:25:44 +02:00
parent d3eeb45651
commit 06aaa9718f
6 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -76,6 +76,9 @@
<Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
<HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
</Reference>

18
src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
View File

@@ -2,17 +2,21 @@
using System.Linq;
using System.Net.Http;
using System.Net.Http.Formatting;
using Microsoft.AspNet.Identity;
using Moq;
using Newtonsoft.Json;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Identity;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
using Umbraco.Core.Security;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.TestHelpers.ControllerTesting;
using Umbraco.Tests.TestHelpers.Entities;
using Umbraco.Web.Editors;
using Umbraco.Web.Models.ContentEditing;
using IUser = Umbraco.Core.Models.Membership.IUser;
namespace Umbraco.Tests.Web.Controllers
{
@@ -41,7 +45,7 @@ namespace Umbraco.Tests.Web.Controllers
userServiceMock.Setup(service => service.GetUserGroupsByAlias(It.IsAny<string[]>()))
.Returns(new[] { Mock.Of<IUserGroup>(group => group.Id == 123 && group.Alias == "writers" && group.Name == "Writers") });
userServiceMock.Setup(service => service.GetUserById(It.IsAny<int>()))
.Returns(new User(1234, "Test", "asdf@asdf.com", "test", "", new List<IReadOnlyUserGroup>(), new int[0], new int[0]));
.Returns(new User(1234, "Test", "asdf@asdf.com", "test", "", new List<IReadOnlyUserGroup>(), new int[0], new int[0]));
//we need to manually apply automapper mappings with the mocked applicationcontext
InitializeMappers(helper.UmbracoContext.Application);
@@ -91,12 +95,18 @@ namespace Umbraco.Tests.Web.Controllers
userServiceMock.Setup(service => service.GetAllUserGroups(It.IsAny<int[]>()))
.Returns(new[] { Mock.Of<IUserGroup>(group => group.Id == 123 && group.Alias == "writers" && group.Name == "Writers") });
userServiceMock.Setup(service => service.GetUserGroupsByAlias(It.IsAny<string[]>()))
.Returns(new[]{Mock.Of<IUserGroup>(group => group.Id == 123 && group.Alias == "writers" && group.Name == "Writers")});
.Returns(new[] { Mock.Of<IUserGroup>(group => group.Id == 123 && group.Alias == "writers" && group.Name == "Writers") });
//we need to manually apply automapper mappings with the mocked applicationcontext
InitializeMappers(helper.UmbracoContext.Application);
return new UsersController(helper.UmbracoContext);
var emailService = new Mock<IIdentityMessageService>();
emailService.Setup(service => service.SendAsync(It.IsAny<IdentityMessage>())).Returns(System.Threading.Tasks.Task.FromResult(0));
var backofficeUserMgr = new BackOfficeUserManager(Mock.Of<IUserStore<BackOfficeIdentityUser, int>>())
{
EmailService = emailService.Object
};
return new UsersController(helper.UmbracoContext, helper, backofficeUserMgr);
});
var invite = new UserInvite
@@ -105,7 +115,7 @@ namespace Umbraco.Tests.Web.Controllers
Email = "test@test.com",
Message = "Hello test!",
Name = "Test",
UserGroups = new[] {"writers"}
UserGroups = new[] { "writers" }
};
var response = await runner.Execute("Users", action, HttpMethod.Post,
new ObjectContent<UserInvite>(invite, new JsonMediaTypeFormatter()));

1
src/Umbraco.Tests/packages.config
View File

@@ -6,6 +6,7 @@
<package id="log4net" version="2.0.8" targetFramework="net45" />
<package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />

5
src/Umbraco.Web/Editors/UmbracoAuthorizedJsonController.cs
View File

@@ -1,4 +1,6 @@
using System.Web.Http.Controllers;
using Umbraco.Core.Models.Identity;
using Umbraco.Core.Security;
using Umbraco.Web.WebApi;
using Umbraco.Web.WebApi.Filters;
@@ -23,5 +25,8 @@ namespace Umbraco.Web.Editors
{
}
protected UmbracoAuthorizedJsonController(UmbracoContext umbracoContext, UmbracoHelper umbracoHelper, BackOfficeUserManager<BackOfficeIdentityUser> backOfficeUserManager) : base(umbracoContext, umbracoHelper, backOfficeUserManager)
{
}
}
}

25
src/Umbraco.Web/Editors/UsersController.cs
View File

@@ -51,7 +51,10 @@ namespace Umbraco.Web.Editors
{
}
public UsersController(UmbracoContext umbracoContext, UmbracoHelper umbracoHelper, BackOfficeUserManager<BackOfficeIdentityUser> backOfficeUserManager) : base(umbracoContext, umbracoHelper, backOfficeUserManager)
{
}
/// <summary>
/// Returns a list of the sizes of gravatar urls for the user or null if the gravatar server cannot be reached
@@ -263,21 +266,13 @@ namespace Umbraco.Web.Editors
var link = string.Format("{0}#/login/false?invite={1}",
ApplicationContext.UmbracoApplicationUrl,
user.SecurityStamp.ToUrlBase64());
try
await UserManager.EmailService.SendAsync(new IdentityMessage
{
await UserManager.EmailService.SendAsync(new IdentityMessage
{
Body = string.Format("You have been invited to the Umbraco Back Office!\n\n{0}\n\nClick this link to accept the invite\n\n{1}", userSave.Message, link),
Destination = userSave.Email,
Subject = "You have been invited to the Umbraco Back Office!"
});
}
catch (Exception ex)
{
throw new HttpResponseException(
Request.CreateErrorResponse(HttpStatusCode.BadRequest, ex));
}
Body = string.Format("You have been invited to the Umbraco Back Office!\n\n{0}\n\nClick this link to accept the invite\n\n{1}", userSave.Message, link),
Destination = userSave.Email,
Subject = "You have been invited to the Umbraco Back Office!"
});
//Email was successful, so save the user now

7
src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
View File

@@ -24,6 +24,8 @@ namespace Umbraco.Web.WebApi
[UmbracoWebApiRequireHttps]
public abstract class UmbracoAuthorizedApiController : UmbracoApiController
{
protected UmbracoAuthorizedApiController()
{
}
@@ -36,6 +38,11 @@ namespace Umbraco.Web.WebApi
{
}
protected UmbracoAuthorizedApiController(UmbracoContext umbracoContext, UmbracoHelper umbracoHelper, BackOfficeUserManager<BackOfficeIdentityUser> backOfficeUserManager) : base(umbracoContext, umbracoHelper)
{
_userManager = backOfficeUserManager;
}
private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
protected BackOfficeUserManager<BackOfficeIdentityUser> UserManager
{