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

checking for uses of userType.

Browse Source
This commit is contained in:
Claus
2017-07-13 09:26:48 +02:00
parent f18b7110c9
commit 6a48c1646d
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs
View File

@@ -125,7 +125,7 @@ namespace Umbraco.Core.Persistence.Repositories
repo.AssignPermission(groupId, permission, entityIds);
}
#region Overrides of RepositoryBase<int,IUserType>
#region Overrides of RepositoryBase<int,IUserGroup>
protected override IUserGroup PerformGet(int id)
{

22
src/Umbraco.Tests/Persistence/Repositories/UserGroupRepositoryTest.cs
View File

@@ -64,18 +64,18 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var repository = CreateRepository(unitOfWork))
{
var userType1 = MockedUserGroup.CreateUserGroup("1");
var userType2 = MockedUserGroup.CreateUserGroup("2");
var userGroup1 = MockedUserGroup.CreateUserGroup("1");
var userGroup2 = MockedUserGroup.CreateUserGroup("2");
// Act
repository.AddOrUpdate(userType1);
repository.AddOrUpdate(userGroup1);
unitOfWork.Commit();
repository.AddOrUpdate(userType2);
repository.AddOrUpdate(userGroup2);
unitOfWork.Commit();
// Assert
Assert.That(userType1.HasIdentity, Is.True);
Assert.That(userType2.HasIdentity, Is.True);
Assert.That(userGroup1.HasIdentity, Is.True);
Assert.That(userGroup2.HasIdentity, Is.True);
}
}
@@ -209,10 +209,10 @@ namespace Umbraco.Tests.Persistence.Repositories
var unitOfWork = provider.GetUnitOfWork();
using (var repository = CreateRepository(unitOfWork))
{
var userTypes = CreateAndCommitMultipleUserGroups(repository, unitOfWork);
var userGroups = CreateAndCommitMultipleUserGroups(repository, unitOfWork);
// Act
var result = repository.GetAll(userTypes[0].Id, userTypes[1].Id);
var result = repository.GetAll(userGroups[0].Id, userGroups[1].Id);
// Assert
Assert.That(result, Is.Not.Null);
@@ -249,10 +249,10 @@ namespace Umbraco.Tests.Persistence.Repositories
var unitOfWork = provider.GetUnitOfWork();
using (var repository = CreateRepository(unitOfWork))
{
var userTypes = CreateAndCommitMultipleUserGroups(repository, unitOfWork);
var userGroups = CreateAndCommitMultipleUserGroups(repository, unitOfWork);
// Act
var exists = repository.Exists(userTypes[0].Id);
var exists = repository.Exists(userGroups[0].Id);
// Assert
Assert.That(exists, Is.True);
@@ -267,7 +267,7 @@ namespace Umbraco.Tests.Persistence.Repositories
var unitOfWork = provider.GetUnitOfWork();
using (var repository = CreateRepository(unitOfWork))
{
var userTypes = CreateAndCommitMultipleUserGroups(repository, unitOfWork);
var userGroups = CreateAndCommitMultipleUserGroups(repository, unitOfWork);
// Act
var query = Query<IUserGroup>.Builder.Where(x => x.Alias == "testUserGroup1" || x.Alias == "testUserGroup2");

24
src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
View File

@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Persistence.Repositories
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax);
var repository = new MediaRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax, mediaTypeRepository, tagRepository, Mock.Of<IContentSection>());
return repository;
}
}
private ContentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out IContentTypeRepository contentTypeRepository)
{
@@ -51,7 +51,7 @@ namespace Umbraco.Tests.Persistence.Repositories
contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, templateRepository);
var repository = new ContentRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
return repository;
}
}
private UserRepository CreateRepository(IScopeUnitOfWork unitOfWork)
{
@@ -86,7 +86,7 @@ namespace Umbraco.Tests.Persistence.Repositories
[Test]
public void Can_Perform_Add_With_Group()
{
var group = MockedUserGroup.CreateUserGroup();
var group = MockedUserGroup.CreateUserGroup();
// Arrange
var provider = new PetaPocoUnitOfWorkProvider(Logger);
@@ -95,22 +95,22 @@ namespace Umbraco.Tests.Persistence.Repositories
{
repository.AddOrUpdate(group);
unitOfWork.Commit();
}
}
using (var repository = CreateRepository(unitOfWork))
{
IUser user = MockedUser.CreateUser();
user.AddGroup(group.ToReadOnlyGroup());
user.AddGroup(group.ToReadOnlyGroup());
// Act
repository.AddOrUpdate(user);
unitOfWork.Commit();
user = repository.Get(user.Id);
user = repository.Get(user.Id);
// Assert
Assert.That(user.HasIdentity, Is.True);
Assert.AreEqual(1, user.Groups.Count());
Assert.AreEqual(1, user.Groups.Count());
Assert.AreEqual(group.Alias, user.Groups.ElementAt(0).Alias);
}
}
@@ -165,7 +165,7 @@ namespace Umbraco.Tests.Persistence.Repositories
var ct = MockedContentTypes.CreateBasicContentType("test");
var content = MockedContent.CreateBasicContent(ct);
var mt = MockedContentTypes.CreateSimpleMediaType("testmedia", "TestMedia");
var media = MockedMedia.CreateSimpleMedia(mt, "asdf", -1);
var media = MockedMedia.CreateSimpleMedia(mt, "asdf", -1);
// Arrange
var provider = new PetaPocoUnitOfWorkProvider(Logger);
@@ -173,8 +173,8 @@ namespace Umbraco.Tests.Persistence.Repositories
IContentTypeRepository contentTypeRepo;
IMediaTypeRepository mediaTypeRepo;
using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepo))
using (var mediaRepository = CreateMediaRepository(unitOfWork, out mediaTypeRepo))
using (contentTypeRepo)
using (var mediaRepository = CreateMediaRepository(unitOfWork, out mediaTypeRepo))
using (contentTypeRepo)
using(mediaTypeRepo)
using (var userRepository = CreateRepository(unitOfWork))
using (var userGroupRepository = CreateUserGroupRepository(unitOfWork))
@@ -185,7 +185,7 @@ namespace Umbraco.Tests.Persistence.Repositories
contentRepository.AddOrUpdate(content);
mediaRepository.AddOrUpdate(media);
unitOfWork.Commit();
unitOfWork.Commit();
var user = CreateAndCommitUserWithGroup(userRepository, userGroupRepository, unitOfWork);
@@ -422,7 +422,7 @@ namespace Umbraco.Tests.Persistence.Repositories
var group = MockedUserGroup.CreateUserGroup();
userGroupRepository.AddOrUpdateGroupWithUsers(@group, new[] {user.Id});
unitOfWork.Commit();
unitOfWork.Commit();
return user;
}

4
src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
View File

@@ -46,8 +46,8 @@ namespace Umbraco.Web.Security.Providers
{
base.Initialize(name, config);
// test for membertype (if not specified, choose the first member type available)
// We'll support both names for legacy reasons: defaultUserTypeAlias & defaultUserGroupAlias
// test for membertype (if not specified, choose the first member type available)
// We'll support both names for legacy reasons: defaultUserTypeAlias & defaultUserGroupAlias
if (config["defaultUserTypeAlias"] != null)
{

2
src/umbraco.providers/members/UmbracoMembershipProvider.cs
View File

@@ -126,7 +126,7 @@ namespace umbraco.providers.members
_defaultMemberTypeAlias = config["defaultMemberTypeAlias"];
if (_defaultMemberTypeAlias.IsNullOrWhiteSpace())
{
throw new ProviderException("No default user group alias is specified in the web.config string. Please add a 'defaultUserTypeAlias' to the add element in the provider declaration in web.config");
throw new ProviderException("No default MemberType alias is specified in the web.config string. Please add a 'defaultMemberTypeAlias' to the add element in the provider declaration in web.config");
}
_hasDefaultMember = true;
}