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

Merge branch '1.0' into 1.1

Browse source 
* 1.0:
  Fix wrong Balrog of Morgoth name
This commit is contained in:
Mateusz Zalewski 2018-03-19 08:48:53 +01:00
commit 350adf5303
No known key found for this signature in database
GPG key ID: BE101BD4D91463A4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/api/admin_users.rst
View file

@ -109,7 +109,7 @@ Exemplary Response
{
"id": 7,
"username": "Balrog",
"usernameCanonical": "barlog",
"usernameCanonical": "balrog",
"roles": [
"ROLE_ADMINISTRATION_ACCESS"
],
@ -219,7 +219,7 @@ Exemplary Response
{
"id": 9,
"username": "Balrog",
"usernameCanonical": "barlog",
"usernameCanonical": "balrog",
"roles": [
"ROLE_ADMINISTRATION_ACCESS"
],
@ -278,7 +278,7 @@ Exemplary Response
{
"id": 9,
"username": "Balrog",
"usernameCanonical": "barlog",
"usernameCanonical": "balrog",
"roles": [
"ROLE_ADMINISTRATION_ACCESS"
],

2
tests/Controller/AdminUserApiTest.php
View file

@ -70,7 +70,7 @@ class AdminUserApiTest extends JsonApiTestCase
$data =
<<<EOT
{
"username": "Barlog",
"username": "Balrog",
"email": "teamEvil@middleearth.com",
"plainPassword": "youShallNotPass",
"localeCode": "en_US"

4
tests/Responses/Expected/admin_user/create_response.json
View file

@ -1,7 +1,7 @@
{
"id": @integer@,
"username": "Barlog",
"usernameCanonical": "barlog",
"username": "Balrog",
"usernameCanonical": "balrog",
"roles": [
"ROLE_ADMINISTRATION_ACCESS"
],