Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ciastektk
ciastektk committed Jan 27, 2021
2 parents f128c03 + 91226e6 commit 78eac8d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions tests/bundle/Functional/SearchView/Criterion/UserEmailTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ public function getCriteriaPayloads(): iterable
return [
'exact match' => [
'json',
$this->buildJsonCriterionQuery('"UserEmailCriterion": "[email protected]"'),
2,
$this->buildJsonCriterionQuery('"UserEmailCriterion": "[email protected]"'),
1,
],
'pattern match' => [
'json',
$this->buildJsonCriterionQuery('"UserEmailCriterion": "nospam@*"'),
2,
$this->buildJsonCriterionQuery('"UserEmailCriterion": "admin@*"'),
1,
],
];
}
Expand Down
4 changes: 2 additions & 2 deletions tests/bundle/Functional/UserTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ public function testIfLoginIsUsedByAnotherUser()
public function testFilterUsersByEmailQueryParameter()
{
$response = $this->sendHttpRequest(
$this->createHttpRequest('GET', '/api/ezp/v2/user/users?email=[email protected]')
$this->createHttpRequest('GET', '/api/ezp/v2/user/users?email=[email protected]')
);

self::assertHttpResponseCodeEquals($response, 200);
Expand All @@ -490,7 +490,7 @@ public function testFilterUsersByEmailQueryParameter()
public function testIfEmailIsUsedByAnotherUser()
{
$response = $this->sendHttpRequest(
$this->createHttpRequest('HEAD', '/api/ezp/v2/user/users?email=[email protected]')
$this->createHttpRequest('HEAD', '/api/ezp/v2/user/users?email=[email protected]')
);

self::assertHttpResponseCodeEquals($response, 200);
Expand Down
22 changes: 11 additions & 11 deletions tests/lib/Server/Input/Parser/UserCreateTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function testParse()
],
'remoteId' => 'remoteId12345678',
'login' => 'login',
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'password',
'enabled' => 'true',
'fields' => [
Expand Down Expand Up @@ -111,7 +111,7 @@ public function testParseExceptionOnInvalidContentType()
],
'remoteId' => 'remoteId12345678',
'login' => 'login',
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'password',
'enabled' => 'true',
'fields' => [
Expand Down Expand Up @@ -144,7 +144,7 @@ public function testParseExceptionOnMissingMainLanguageCode()
],
'remoteId' => 'remoteId12345678',
'login' => 'login',
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'password',
'enabled' => 'true',
'fields' => [
Expand Down Expand Up @@ -177,7 +177,7 @@ public function testParseExceptionOnMissingLogin()
'_href' => '/content/sections/4',
],
'remoteId' => 'remoteId12345678',
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'password',
'enabled' => 'true',
'fields' => [
Expand Down Expand Up @@ -244,7 +244,7 @@ public function testParseExceptionOnMissingPassword()
],
'remoteId' => 'remoteId12345678',
'login' => 'login',
'email' => '[email protected]',
'email' => '[email protected]',
'enabled' => 'true',
'fields' => [
'field' => [
Expand Down Expand Up @@ -275,7 +275,7 @@ public function testParseExceptionOnInvalidSection()
'Section' => [],
'remoteId' => 'remoteId12345678',
'login' => 'login',
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'password',
'enabled' => 'true',
'fields' => [
Expand Down Expand Up @@ -309,7 +309,7 @@ public function testParseExceptionOnInvalidFields()
],
'remoteId' => 'remoteId12345678',
'login' => 'login',
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'password',
'enabled' => 'true',
];
Expand All @@ -335,7 +335,7 @@ public function testParseExceptionOnMissingFieldDefinitionIdentifier()
],
'remoteId' => 'remoteId12345678',
'login' => 'login',
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'password',
'enabled' => 'true',
'fields' => [
Expand Down Expand Up @@ -372,7 +372,7 @@ public function testParseExceptionOnInvalidFieldDefinitionIdentifier()
],
'remoteId' => 'remoteId12345678',
'login' => 'login',
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'password',
'enabled' => 'true',
'fields' => [
Expand Down Expand Up @@ -406,7 +406,7 @@ public function testParseExceptionOnMissingFieldValue()
],
'remoteId' => 'remoteId12345678',
'login' => 'login',
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'password',
'enabled' => 'true',
'fields' => [
Expand Down Expand Up @@ -478,7 +478,7 @@ protected function getUserServiceMock()
->method('newUserCreateStruct')
->with(
$this->equalTo('login'),
$this->equalTo('[email protected]'),
$this->equalTo('[email protected]'),
$this->equalTo('password'),
$this->equalTo('eng-US'),
$this->equalTo($contentType)
Expand Down
12 changes: 6 additions & 6 deletions tests/lib/Server/Input/Parser/UserUpdateTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function testParse()
],
],
],
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'somePassword',
'enabled' => 'true',
'__url' => '/user/users/14',
Expand Down Expand Up @@ -85,7 +85,7 @@ public function testParse()
);

$this->assertEquals(
'[email protected]',
'[email protected]',
$result->userUpdateStruct->email,
'email not created correctly'
);
Expand Down Expand Up @@ -129,7 +129,7 @@ public function testParseExceptionOnMissingSectionHref()
],
],
],
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'somePassword',
'enabled' => 'true',
'__url' => '/user/users/14',
Expand All @@ -153,7 +153,7 @@ public function testParseExceptionOnInvalidFields()
],
'remoteId' => 'remoteId123456',
'fields' => [],
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'somePassword',
'enabled' => 'true',
'__url' => '/user/users/14',
Expand Down Expand Up @@ -183,7 +183,7 @@ public function testParseExceptionOnMissingFieldDefinitionIdentifier()
],
],
],
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'somePassword',
'enabled' => 'true',
'__url' => '/user/users/14',
Expand Down Expand Up @@ -213,7 +213,7 @@ public function testParseExceptionOnMissingFieldValue()
],
],
],
'email' => '[email protected]',
'email' => '[email protected]',
'password' => 'somePassword',
'enabled' => 'true',
'__url' => '/user/users/14',
Expand Down

0 comments on commit 78eac8d

Please sign in to comment.