Skip to content
This repository has been archived by the owner on May 1, 2019. It is now read-only.

Fix: When validating repositories, attempt to find by html_url, not by name #393

Merged
merged 2 commits into from
Feb 17, 2015
Merged
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
2 changes: 1 addition & 1 deletion module/ZfModule/src/ZfModule/Service/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function currentUserModules()
continue;
}

$module = $this->moduleMapper->findByName($repository->name);
$module = $this->moduleMapper->findByUrl($repository->html_url);
if (!($module instanceof Entity\Module)) {
continue;
}
Expand Down
36 changes: 12 additions & 24 deletions module/ZfModule/test/ZfModuleTest/Service/ModuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,7 @@ public function testListAllModulesWithArgumentListsModulesFromDatabaseLimited()

public function testListUserModulesListsCurrentUsersModulesFromApiFoundInDatabase()
{
$name = 'foo';

$repository = new stdClass();
$repository->fork = false;
$repository->permissions = new stdClass();
$repository->permissions->push = true;
$repository->name = $name;
$repository = $this->repository();

$module = $this->getMockBuilder(Entity\Module::class)->getMock();

Expand All @@ -99,8 +93,8 @@ public function testListUserModulesListsCurrentUsersModulesFromApiFoundInDatabas

$moduleMapper
->expects($this->once())
->method('findByName')
->with($this->equalTo($name))
->method('findByUrl')
->with($this->equalTo($repository->html_url))
->willReturn($module)
;

Expand Down Expand Up @@ -135,16 +129,15 @@ public function testListUserModulesListsCurrentUsersModulesFromApiFoundInDatabas

public function testListUserModulesDoesNotLookupModulesFromApiWhereUserHasNoPushPrivilege()
{
$repository = new stdClass();
$repository->fork = false;
$repository->permissions = new stdClass();
$repository = $this->repository();

$repository->permissions->push = false;

$moduleMapper = $this->getMockBuilder(Mapper\Module::class)->getMock();

$moduleMapper
->expects($this->never())
->method('findByName')
->method('findByUrl')
;

$currentUserService = $this->getMockBuilder(Api\CurrentUser::class)->getMock();
Expand Down Expand Up @@ -178,14 +171,15 @@ public function testListUserModulesDoesNotLookupModulesFromApiWhereUserHasNoPush

public function testListUserModulesDoesNotLookupModulesFromApiThatAreForks()
{
$repository = new stdClass();
$repository = $this->repository();

$repository->fork = true;

$moduleMapper = $this->getMockBuilder(Mapper\Module::class)->getMock();

$moduleMapper
->expects($this->never())
->method('findByName')
->method('findByUrl')
;

$currentUserService = $this->getMockBuilder(Api\CurrentUser::class)->getMock();
Expand Down Expand Up @@ -219,20 +213,14 @@ public function testListUserModulesDoesNotLookupModulesFromApiThatAreForks()

public function testListUserModulesDoesNotListModulesFromApiNotFoundInDatabase()
{
$name = 'foo';

$repository = new stdClass();
$repository->fork = false;
$repository->permissions = new stdClass();
$repository->permissions->push = true;
$repository->name = $name;
$repository = $this->repository();

$moduleMapper = $this->getMockBuilder(Mapper\Module::class)->getMock();

$moduleMapper
->expects($this->once())
->method('findByName')
->with($this->equalTo($name))
->method('findByUrl')
->with($this->equalTo($repository->html_url))
->willReturn(false)
;

Expand Down