Skip to content

Commit cc4819e

Browse files
glo00108glo00108
committed
added credentials file
1 parent 4714912 commit cc4819e

File tree

5 files changed

+161
-17
lines changed

5 files changed

+161
-17
lines changed

‎.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ dev/tests/docs/*
2020
dev/tests/_output
2121
dev/tests/functional.suite.yml
2222
/v2/
23-
dev/.credentials.example
2423
dev/tests/.phpunit.result.cache
25-
dev/tests/verification/TestModule/Test/testFile.xml
24+
dev/tests/verification/TestModule/Test/testFile.xml

‎dev/.credentials

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
#magento/tfa/OTP_SHARED_SECRET=
2+
3+
magento/MAGENTO_ADMIN_PASSWORD=123123q
4+
5+
#magento/carriers_fedex_account=
6+
#magento/carriers_fedex_meter_number=
7+
#magento/carriers_fedex_key=
8+
#magento/carriers_fedex_password=
9+
10+
#magento/carriers_ups_password=
11+
#magento/carriers_ups_username=
12+
#magento/carriers_ups_access_license_number=
13+
#magento/carriers_ups_shipper_number=
14+
15+
#magento/carriers_usps_userid=
16+
#magento/carriers_usps_password=
17+
18+
#magento/carriers_dhl_id_us=
19+
#magento/carriers_dhl_password_us=
20+
#magento/carriers_dhl_account_us=
21+
22+
#magento/carriers_dhl_id_eu=
23+
#magento/carriers_dhl_password_eu=
24+
#magento/carriers_dhl_account_eu=
25+
26+
27+
#magento/payment_authorizenet_login=
28+
#magento/payment_authorizenet_trans_key=
29+
#magento/payment_authorizenet_trans_md5=
30+
31+
#magento/authorizenet_fraud_review_login=
32+
#magento/authorizenet_fraud_review_trans_key=
33+
#magento/authorizenet_fraud_review_md5=
34+
35+
#magento/braintree_enabled_fraud_merchant_account_id=
36+
#magento/braintree_enabled_fraud_merchant_id=
37+
#magento/braintree_enabled_fraud_public_key=
38+
#magento/braintree_enabled_fraud_private_key=
39+
40+
#magento/braintree_disabled_fraud_merchant_account_id=
41+
#magento/braintree_disabled_fraud_merchant_id=
42+
#magento/braintree_disabled_fraud_public_key=
43+
#magento/braintree_disabled_fraud_private_key=
44+
45+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_business_account=
46+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_username=
47+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_password=
48+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_signature=
49+
#magento/payment_paypal_express_merchant_id=
50+
51+
#magento/payflow_pro_fraud_protection_enabled_business_account=
52+
#magento/payflow_pro_fraud_protection_enabled_partner=
53+
#magento/payflow_pro_fraud_protection_enabled_user=
54+
#magento/payflow_pro_fraud_protection_enabled_pwd=
55+
#magento/payflow_pro_fraud_protection_enabled_vendor=
56+
57+
#magento/payflow_pro_business_account=
58+
#magento/payflow_pro_partner=
59+
#magento/payflow_pro_user=
60+
#magento/payflow_pro_pwd=
61+
#magento/payflow_pro_vendor=
62+
63+
#magento/payflow_link_business_account_email=
64+
#magento/payflow_link_partner=
65+
#magento/payflow_link_user=
66+
#magento/payflow_link_password=
67+
#magento/payflow_link_vendor=
68+
69+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_business_account=
70+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_api_username=
71+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_api_password=
72+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_api_signature=
73+
74+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_business_account=
75+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_username=
76+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_password=
77+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_signature=
78+

‎dev/.credentials.example

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
#magento/tfa/OTP_SHARED_SECRET
2+
3+
magento/MAGENTO_ADMIN_PASSWORD=123123q
4+
5+
#magento/carriers_fedex_account=
6+
#magento/carriers_fedex_meter_number=
7+
#magento/carriers_fedex_key=
8+
#magento/carriers_fedex_password=
9+
10+
#magento/carriers_ups_password=
11+
#magento/carriers_ups_username=
12+
#magento/carriers_ups_access_license_number=
13+
#magento/carriers_ups_shipper_number=
14+
15+
#magento/carriers_usps_userid=
16+
#magento/carriers_usps_password=
17+
18+
#magento/carriers_dhl_id_us=
19+
#magento/carriers_dhl_password_us=
20+
#magento/carriers_dhl_account_us=
21+
22+
#magento/carriers_dhl_id_eu=
23+
#magento/carriers_dhl_password_eu=
24+
#magento/carriers_dhl_account_eu=
25+
26+
27+
#magento/payment_authorizenet_login=
28+
#magento/payment_authorizenet_trans_key=
29+
#magento/payment_authorizenet_trans_md5=
30+
31+
#magento/authorizenet_fraud_review_login=
32+
#magento/authorizenet_fraud_review_trans_key=
33+
#magento/authorizenet_fraud_review_md5=
34+
35+
#magento/braintree_enabled_fraud_merchant_account_id=
36+
#magento/braintree_enabled_fraud_merchant_id=
37+
#magento/braintree_enabled_fraud_public_key=
38+
#magento/braintree_enabled_fraud_private_key=
39+
40+
#magento/braintree_disabled_fraud_merchant_account_id=
41+
#magento/braintree_disabled_fraud_merchant_id=
42+
#magento/braintree_disabled_fraud_public_key=
43+
#magento/braintree_disabled_fraud_private_key=
44+
45+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_business_account=
46+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_username=
47+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_password=
48+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_signature=
49+
#magento/payment_paypal_express_merchant_id=
50+
51+
#magento/payflow_pro_fraud_protection_enabled_business_account=
52+
#magento/payflow_pro_fraud_protection_enabled_partner=
53+
#magento/payflow_pro_fraud_protection_enabled_user=
54+
#magento/payflow_pro_fraud_protection_enabled_pwd=
55+
#magento/payflow_pro_fraud_protection_enabled_vendor=
56+
57+
#magento/payflow_pro_business_account=
58+
#magento/payflow_pro_partner=
59+
#magento/payflow_pro_user=
60+
#magento/payflow_pro_pwd=
61+
#magento/payflow_pro_vendor=
62+
63+
#magento/payflow_link_business_account_email=
64+
#magento/payflow_link_partner=
65+
#magento/payflow_link_user=
66+
#magento/payflow_link_password=
67+
#magento/payflow_link_vendor=
68+
69+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_business_account=
70+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_api_username=
71+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_api_password=
72+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_api_signature=
73+
74+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_business_account=
75+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_username=
76+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_password=
77+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_signature=
78+

‎dev/tests/unit/Magento/FunctionalTestFramework/Util/ModuleResolverTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use ReflectionProperty;
1717
use tests\unit\Util\MagentoTestCase;
1818
use tests\unit\Util\TestLoggingUtil;
19-
use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
2019

2120
/**
2221
* Class ModuleResolverTest
@@ -808,7 +807,7 @@ public function testGetModulePathsNoAdminToken(): void
808807
$this->setMockResolverProperties($resolver);
809808

810809
// Cannot Generate if no --force was passed in and no Admin Token is returned successfully
811-
$this->expectException(TestFrameworkException::class);
810+
$this->expectException(FastFailException::class);
812811
$resolver->getModulesPath();
813812
}
814813

@@ -860,7 +859,7 @@ public function testGetAdminTokenWithMissingEnv(): void
860859
$this->setMockResolverProperties($resolver);
861860

862861
// Expect exception
863-
$this->expectException(TestFrameworkException::class);
862+
$this->expectException(FastFailException::class);
864863
$resolver->getModulesPath();
865864
}
866865

@@ -880,7 +879,7 @@ public function testGetAdminTokenWithBadResponse(): void
880879
$this->setMockResolverProperties($resolver);
881880

882881
// Expect exception
883-
$this->expectException(TestFrameworkException::class);
882+
$this->expectException(FastFailException::class);
884883
$resolver->getModulesPath();
885884
}
886885

‎docs/configuration.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,6 @@ Example:
5252
MAGENTO_ADMIN_USERNAME=admin
5353
```
5454

55-
### MAGENTO_ADMIN_PASSWORD
56-
57-
The password that tests will use to log in to the Magento Admin page.
58-
59-
Example:
60-
61-
```conf
62-
MAGENTO_ADMIN_PASSWORD=1234reTyt%$7
63-
```
64-
6555
## Advanced configuration
6656

6757
Depending on the environment you use, you may need to configure MFTF more precisely by setting additional configuration parameters.
@@ -362,7 +352,7 @@ WAIT_TIMEOUT=30
362352
### ENABLE_PAUSE
363353

364354
Enables the ability to pause test execution at any point, and enter an interactive shell where you can try commands in action.
365-
When pause is enabled, MFTF will generate pause() command in _failed() hook so that test will pause execution when failed.
355+
When pause is enabled, MFTF will generate pause() command in _failed() hook so that test will pause execution when failed.
366356

367357
```conf
368358
ENABLE_PAUSE=true

0 commit comments

Comments
 (0)