kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 09:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[API][Zone] Minor fixes after review

Browse source
This commit is contained in:
Grzegorz Sadowski 2020-05-08 16:41:25 +02:00
parent faa9da1200
commit d19fca5cba
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
6 changed files with 72 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
src/Sylius/Behat/Context/Api/Admin/ManagingZonesContext.php
View file

@ -107,12 +107,12 @@ final class ManagingZonesContext implements Context
}
/**
* @When I add a zone :zoneName
* @When I add a zone :zone
*/
public function iAddAZone(ZoneInterface $zoneName): void
public function iAddAZone(ZoneInterface $zone): void
{
$this->client->addSubResourceData('members', [
'code' => $zoneName->getCode(),
'code' => $zone->getCode(),
]);
}
@ -143,24 +143,24 @@ final class ManagingZonesContext implements Context
}
/**
* @When I delete zone named :zoneName
* @When I delete zone named :zone
*/
public function iDeleteZoneNamed(ZoneInterface $zoneName): void
public function iDeleteZoneNamed(ZoneInterface $zone): void
{
$this->client->delete($zoneName->getCode());
$this->client->delete($zone->getCode());
}
/**
* @When I check the :zoneName zone
* @When I check also the :zoneName zone
* @When I check the :zone zone
* @When I check also the :zone zone
*/
public function iCheckTheZone(ZoneInterface $zoneName): void
public function iCheckTheZone(ZoneInterface $zone): void
{
$ZoneToDelete = [];
if ($this->sharedStorage->has('zone_to_delete')) {
$ZoneToDelete = $this->sharedStorage->get('zone_to_delete');
}
$ZoneToDelete[] = $zoneName->getCode();
$ZoneToDelete[] = $zone->getCode();
$this->sharedStorage->set('zone_to_delete', $ZoneToDelete);
}
@ -175,11 +175,11 @@ final class ManagingZonesContext implements Context
}
/**
* @When I want to modify the zone named :zoneName
* @When I want to modify the zone named :zone
*/
public function iWantToModifyTheZoneNamed(ZoneInterface $zoneName): void
public function iWantToModifyTheZoneNamed(ZoneInterface $zone): void
{
$this->client->buildUpdateRequest($zoneName->getCode());
$this->client->buildUpdateRequest($zone->getCode());
}
/**
@ -199,11 +199,11 @@ final class ManagingZonesContext implements Context
}
/**
* @When I remove the :zoneName zone member
* @When I remove the :zone zone member
*/
public function iRemoveTheZoneMember(ZoneInterface $zoneName): void
public function iRemoveTheZoneMember(ZoneInterface $zone): void
{
$this->removeZoneMember($zoneName);
$this->removeZoneMember($zone);
}
/**
@ -215,12 +215,14 @@ final class ManagingZonesContext implements Context
}
/**
* @Then the zone named :zoneName with the :country country member should appear in the registry
* @Then the zone named :zone with the :country country member should appear in the registry
*/
public function theZoneNamedWithTheCountryMemberShouldAppearInTheRegistry(ZoneInterface $zoneName, CountryInterface $country): void
{
public function theZoneNamedWithTheCountryMemberShouldAppearInTheRegistry(
ZoneInterface $zone,
CountryInterface $country
): void {
Assert::true($this->responseChecker->hasItemWithValue(
$this->client->subResourceIndex('members', $zoneName->getCode()),
$this->client->subResourceIndex('members', $zone->getCode()),
'code',
$country->getCode()
));
@ -235,17 +237,17 @@ final class ManagingZonesContext implements Context
Assert::false(
$this->responseChecker->hasValue($this->client->update(), 'code', 'NEW_CODE'),
'The code field with value NEW_CODE exist'
'The code field with value NEW_CODE exists'
);
}
/**
* @Then I can not add a zone :zoneName
* @Then I can not add a zone :zone
*/
public function iCanNotAddAZone(ZoneInterface $zoneName): void
public function iCanNotAddAZone(ZoneInterface $zone): void
{
$this->client->addSubResourceData('members', [
'code' => $zoneName->getCode(),
'code' => $zone->getCode(),
]);
Assert::contains(
@ -255,26 +257,30 @@ final class ManagingZonesContext implements Context
}
/**
* @Then the zone named :zoneName with the :province province member should appear in the registry
* @Then the zone named :zone with the :province province member should appear in the registry
*/
public function theZoneNamedWithTheProvinceMemberShouldAppearInTheRegistry(ZoneInterface $zoneName, ProvinceInterface $province): void
{
public function theZoneNamedWithTheProvinceMemberShouldAppearInTheRegistry(
ZoneInterface $zone,
ProvinceInterface $province
): void {
Assert::true($this->responseChecker->hasItemWithValue(
$this->client->subResourceIndex('members', $zoneName->getCode()),
$this->client->subResourceIndex('members', $zone->getCode()),
'code',
$province->getCode()
));
}
/**
* @Then the zone named :zoneNamed with the :zoneName zone member should appear in the registry
* @Then the zone named :zone with the :otherZone zone member should appear in the registry
*/
public function theZoneNamedWithTheZoneMemberShouldAppearInTheRegistry(ZoneInterface $zoneNamed, ZoneInterface $zoneName): void
{
public function theZoneNamedWithTheZoneMemberShouldAppearInTheRegistry(
ZoneInterface $zone,
ZoneInterface $otherZone
): void {
Assert::true($this->responseChecker->hasItemWithValue(
$this->client->subResourceIndex('members', $zoneNamed->getCode()),
$this->client->subResourceIndex('members', $zone->getCode()),
'code',
$zoneName->getCode()
$otherZone->getCode()
));
}
@ -329,7 +335,7 @@ final class ManagingZonesContext implements Context
{
Assert::false(
$this->responseChecker->hasItemWithValue($this->client->index(), 'name', $name),
sprintf('Zone with name %s exist', $name)
sprintf('Zone with name %s exists', $name)
);
}
@ -340,7 +346,7 @@ final class ManagingZonesContext implements Context
{
Assert::false(
$this->responseChecker->hasItemWithValue($this->client->index(), $field, $value),
sprintf('Zone with %s %s exist', $field, $value)
sprintf('Zone with %s %s exists', $field, $value)
);
}
@ -355,7 +361,10 @@ final class ManagingZonesContext implements Context
$zoneMember->getCode()
));
Assert::same($this->responseChecker->countCollectionItems($this->client->subResourceIndex('members', $zone->getCode())), 1);
Assert::same(
$this->responseChecker->countCollectionItems($this->client->subResourceIndex('members', $zone->getCode())),
1
);
}
/**
@ -472,15 +481,8 @@ final class ManagingZonesContext implements Context
*/
private function removeZoneMember($objectToRemove): void
{
/** @var ZoneInterface $zone */
$zone = $this->sharedStorage->get('zone');
$iri = $this->iriConverter->getItemIriFromResourceClass(ZoneMember::class, ['code' => $objectToRemove->getCode()]);
$members = $this->responseChecker->getValue($this->client->show($zone->getCode()), 'members');
foreach ($members as $key => $member) {
if ($iri === $member) {
$this->client->removeSubResource('members', $member);
}
}
$this->client->removeSubResource('members', $iri);
}
}

38
src/Sylius/Behat/Context/Transform/ZoneContext.php
View file

@ -31,21 +31,24 @@ final class ZoneContext implements Context
/**
* @Transform /^"([^"]+)" zone$/
* @Transform /^zone "([^"]+)"$/
* @Transform :zone
*/
public function getZoneByCode(string $code): ZoneInterface
{
return $this->getZoneBy(['code' => $code]);
}
/**
* @Transform /^zone named "([^"]+)"$/
* @Transform :zoneName
* @Transform :zoneNamed
* @Transform :zone
* @Transform :otherZone
*/
public function getZoneByName(string $name): ZoneInterface
public function getZone(string $codeOrName): ZoneInterface
{
return $this->getZoneBy(['name' => $name]);
$zone = $this->zoneRepository->findOneBy(['code' => $codeOrName]);
if (null !== $zone) {
return $zone;
}
$zone = $this->zoneRepository->findOneBy(['name' => $codeOrName]);
Assert::notNull(
$zone,
'Zone does not exist.'
);
return $zone;
}
/**
@ -61,15 +64,4 @@ final class ZoneContext implements Context
return $zone;
}
private function getZoneBy(array $parameters): ZoneInterface
{
$existingZone = $this->zoneRepository->findOneBy($parameters);
Assert::notNull(
$existingZone,
'Zone does not exist.'
);
return $existingZone;
}
}

4
src/Sylius/Behat/Context/Ui/Admin/ManagingZonesContext.php
View file

@ -233,7 +233,7 @@ final class ManagingZonesContext implements Context
/**
* @Then I should not be able to edit its code
*/
public function iShouldNotBeAbleToEditItsCode()
public function iShouldNotBeAbleToEditItsCode(): void
{
Assert::true($this->updatePage->isCodeDisabled());
}
@ -291,7 +291,7 @@ final class ManagingZonesContext implements Context
/**
* @Then I should not be able to edit its type
*/
public function iShouldNotBeAbleToEditItsType()
public function iShouldNotBeAbleToEditItsType(): void
{
Assert::true($this->createPage->isTypeFieldDisabled());
}

4
src/Sylius/Behat/Context/Ui/Shop/Checkout/CheckoutAddressingContext.php
View file

@ -150,7 +150,7 @@ final class CheckoutAddressingContext implements Context
/**
* @When I specify shipping country province as :provinceName
*/
public function iSpecifyShippingCountryProvinceAs($provinceName)
public function iSpecifyShippingCountryProvinceAs(string $provinceName): void
{
$this->addressPage->selectShippingAddressProvince($provinceName);
}
@ -158,7 +158,7 @@ final class CheckoutAddressingContext implements Context
/**
* @When I specify billing country province as :provinceName
*/
public function iSpecifyBillingCountryProvinceAs($provinceName)
public function iSpecifyBillingCountryProvinceAs(string $provinceName): void
{
$this->addressPage->selectBillingAddressProvince($provinceName);
}

4
src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Zone.xml
View file

@ -46,7 +46,9 @@
<attribute name="groups">zone:update</attribute>
</attribute>
</itemOperation>
<itemOperation name="delete" />
<itemOperation name="delete">
<attribute name="security">is_granted('ROLE_API_ACCESS')</attribute>
</itemOperation>
</itemOperations>
<property name="id" identifier="false" writable="false" />

8
src/Sylius/Bundle/ApiBundle/Resources/config/services.xml
View file

@ -21,10 +21,10 @@
<import resource="services/context_builders.xml" />
<import resource="services/data_persisters.xml" />
<import resource="services/data_providers.xml" />
<import resource="services/event_subscribers.xml"/>
<import resource="services/filters.xml"/>
<import resource="services/providers.xml"/>
<import resource="services/validator.xml"/>
<import resource="services/event_subscribers.xml" />
<import resource="services/filters.xml" />
<import resource="services/providers.xml" />
<import resource="services/validator.xml" />
</imports>
<services>