Skip to content

Commit 7050b4e

Browse files
annahiletaannahileta
authored
fixes for unit tests to support PHPUnit version 11 (#163)
1 parent 0998025 commit 7050b4e

10 files changed

+157
-124
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"scripts": {
13-
"test": "./vendor/bin/phpunit --verbose tests"
13+
"test": "./vendor/bin/phpunit tests"
1414
},
1515
"config": {
1616
"process-timeout": 0

‎composer.lock

Lines changed: 35 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Click/ActivateClickwrapTest.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,27 @@
99

1010
final class ActivateClickwrapTest extends TestCase
1111
{
12+
private string $templateName = 'Example Signer and CC template';
13+
14+
private string $clickwrapName = "Clickwrap";
15+
1216
protected const DEMO_DOCS_PATH = __DIR__ . '/../../public/demo_documents/';
1317

1418
public function testCreateClickwrap_CorrectInputValues_ReturnClickwrapVersionSummaryResponse()
1519
{
1620
// Arrange
1721
$testConfig = new TestConfig();
22+
23+
JWTLoginMethod::jwtAuthenticationMethod(ApiTypes::ESIGNATURE, $testConfig);
24+
$templateInformation = DocuSignHelpers::createTemplateMethod($this->templateName, $testConfig);
25+
$testConfig->setTemplateId($templateInformation["template_id"]);
26+
1827
JWTLoginMethod::jwtAuthenticationMethod(ApiTypes::CLICK, $testConfig);
19-
(new CreateClickwrapTest($testConfig))->testCreateClickwrap_CorrectInputValues_ReturnClickwrapVersionSummaryResponse();
28+
29+
$clickwrapVersionSummaryResponse = DocuSignHelpers::createClickwrapMethod($this->clickwrapName, $testConfig);
30+
31+
$testConfig->setClickwrapId($clickwrapVersionSummaryResponse["clickwrap_id"]);
32+
$testConfig->setClickwrapVersionNumber($clickwrapVersionSummaryResponse["version_number"]);
2033

2134
$activeStatus = "active";
2235
$requestArguments = [

‎tests/Click/CreateClickwrapTest.php

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,30 @@
99

1010
final class CreateClickwrapTest extends TestCase
1111
{
12-
protected const DEMO_DOCS_PATH = __DIR__ . '/../../public/demo_documents/';
12+
private string $templateName = 'Example Signer and CC template';
1313

14-
protected $testConfig;
15-
16-
public function __construct($testConfig = null)
17-
{
18-
parent::__construct();
19-
$this->testConfig = $testConfig ?? new TestConfig();
20-
}
14+
private string $clickwrapName = "Clickwrap";
2115

2216
public function testCreateClickwrap_CorrectInputValues_ReturnClickwrapVersionSummaryResponse()
2317
{
2418
// Arrange
25-
JWTLoginMethod::jwtAuthenticationMethod(ApiTypes::CLICK, $this->testConfig);
26-
(new CreateTemplateTest())->testCreateTemplate_CorrectInputValues_ReturnArray();
27-
28-
$clickwrapName = "Clickwrap";
29-
$requestArguments = [
30-
'account_id' => $this->testConfig->getAccountId(),
31-
'base_path' => $this->testConfig->getBasePath(),
32-
'ds_access_token' => $this->testConfig->getAccessToken(),
33-
'clickwrap_name' => $clickwrapName,
34-
];
35-
36-
$clientService = new ClickApiClientService($requestArguments);
37-
19+
$testConfig = new TestConfig();
20+
21+
JWTLoginMethod::jwtAuthenticationMethod(ApiTypes::ESIGNATURE, $testConfig);
22+
$templateInformation = DocuSignHelpers::createTemplateMethod($this->templateName, $testConfig);
23+
$testConfig->setTemplateId($templateInformation["template_id"]);
24+
25+
JWTLoginMethod::jwtAuthenticationMethod(ApiTypes::CLICK, $testConfig);
26+
3827
// Act
39-
$clickwrapVersionSummaryResponse = CreateClickwrapService::createClickwrap(
40-
$requestArguments,
41-
self::DEMO_DOCS_PATH,
42-
$clientService
43-
);
28+
$clickwrapVersionSummaryResponse = DocuSignHelpers::createClickwrapMethod($this->clickwrapName, $testConfig);
4429

45-
$this->testConfig->setClickwrapId($clickwrapVersionSummaryResponse["clickwrap_id"]);
46-
$this->testConfig->setClickwrapVersionNumber($clickwrapVersionSummaryResponse["version_number"]);
30+
$testConfig->setClickwrapId($clickwrapVersionSummaryResponse["clickwrap_id"]);
31+
$testConfig->setClickwrapVersionNumber($clickwrapVersionSummaryResponse["version_number"]);
4732

4833
// Assert
4934
$this->assertNotEmpty($clickwrapVersionSummaryResponse);
5035
$this->assertNotNull($clickwrapVersionSummaryResponse);
51-
$this->assertEquals($clickwrapName, $clickwrapVersionSummaryResponse["clickwrap_name"]);
36+
$this->assertEquals($this->clickwrapName, $clickwrapVersionSummaryResponse["clickwrap_name"]);
5237
}
5338
}

‎tests/DocuSignHelpers.php

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?php
2+
namespace DocuSign\Tests;
3+
4+
use DocuSign\Click\Model\ClickwrapVersionSummaryResponse;
5+
use DocuSign\Services\ClickApiClientService;
6+
use DocuSign\Services\Examples\eSignature\CreateBrandService;
7+
use DocuSign\Services\Examples\Click\CreateClickwrapService;
8+
use DocuSign\Services\Examples\eSignature\CreateTemplateService;
9+
use DocuSign\Services\SignatureClientService;
10+
11+
final class DocuSignHelpers
12+
{
13+
private const DEMO_DOCS_PATH = __DIR__ . '/../public/demo_documents/';
14+
15+
public static function createClickwrapMethod(string $clickwrapName, TestConfig $testConfig): ClickwrapVersionSummaryResponse
16+
{
17+
$requestArguments = [
18+
'account_id' => $testConfig->getAccountId(),
19+
'base_path' => $testConfig->getBasePath(),
20+
'ds_access_token' => $testConfig->getAccessToken(),
21+
'clickwrap_name' => $clickwrapName,
22+
];
23+
24+
$clientService = new ClickApiClientService($requestArguments);
25+
26+
return CreateClickwrapService::createClickwrap(
27+
$requestArguments,
28+
self::DEMO_DOCS_PATH,
29+
$clientService
30+
);
31+
}
32+
33+
public static function createTemplateMethod(string $templateName, TestConfig $testConfig): array
34+
{
35+
$requestArguments = [
36+
'account_id' => $testConfig->getAccountId(),
37+
'base_path' => $testConfig->getBasePath(),
38+
'ds_access_token' => $testConfig->getAccessToken()
39+
];
40+
41+
$clientService = new SignatureClientService($requestArguments);
42+
43+
return CreateTemplateService::createTemplate(
44+
$requestArguments,
45+
$templateName,
46+
self::DEMO_DOCS_PATH,
47+
$clientService
48+
);
49+
}
50+
51+
public static function createBrand(TestConfig $testConfig): array {
52+
$defaultLanguage = "en";
53+
$requestArguments = [
54+
'account_id' => $testConfig->getAccountId(),
55+
'base_path' => $testConfig->getBasePath(),
56+
'ds_access_token' => $testConfig->getAccessToken(),
57+
'brand_args' => [
58+
'brand_name' => substr(str_shuffle(MD5(microtime())), 0, 10),
59+
'default_language' => $defaultLanguage,
60+
]
61+
];
62+
63+
$clientService = new SignatureClientService($requestArguments);
64+
65+
return CreateBrandService::createBrand($requestArguments, $clientService);
66+
}
67+
}

0 commit comments

Comments
 (0)