From e9a38baf105f29fe37f62ee16a1dfffc9c78bfc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Klatt?= Date: Thu, 3 Aug 2017 12:27:18 +0000 Subject: [PATCH] core-1652 fixed namespaces --- codeception.yml | 33 ++-- .../Presentation/CustomerAddressCest.php | 4 +- .../Presentation/CustomerAddressesCest.php | 4 +- .../Presentation/CustomerLoginCest.php | 4 +- .../Presentation/CustomerLogoutCest.php | 4 +- .../Presentation/CustomerNewsletterCest.php | 4 +- .../Presentation/CustomerOverviewCest.php | 4 +- .../Presentation/CustomerProfileCest.php | 4 +- .../Presentation/CustomerRegistrationCest.php | 4 +- .../NewsletterSubscriptionCest.php | 4 +- .../Presentation/CmsGuiCreatePageCest.php | 4 +- .../Presentation/CmsGuiPageListCest.php | 6 +- .../Tax/Presentation/Tester/TaxRateTester.php | 172 ------------------ 13 files changed, 43 insertions(+), 208 deletions(-) delete mode 100644 tests/PyzTest/Zed/Tax/Presentation/Tester/TaxRateTester.php diff --git a/codeception.yml b/codeception.yml index a527906ef..198de8f41 100644 --- a/codeception.yml +++ b/codeception.yml @@ -1,24 +1,27 @@ namespace: PyzTest +actor: Tester include: - - tests/PyzTest/Yves/Application - - tests/PyzTest/Yves/Assets - - tests/PyzTest/Yves/Availability - - tests/PyzTest/Yves/Checkout - - tests/PyzTest/Yves/Customer - - tests/PyzTest/Yves/Newsletter - - tests/PyzTest/Zed/Calculation - - tests/PyzTest/Zed/CmsGui - - tests/PyzTest/Zed/Console - - tests/PyzTest/Zed/NavigationGui - - tests/PyzTest/Zed/Product - - tests/PyzTest/Zed/ProductOption - - tests/PyzTest/Zed/ProductRelation - - tests/PyzTest/Zed/Tax - - tests/PyzTest/Zed/Touch + - tests/PyzTest/*/* +# - tests/PyzTest/Yves/Application +# - tests/PyzTest/Yves/Assets +# - tests/PyzTest/Yves/Availability +# - tests/PyzTest/Yves/Checkout +# - tests/PyzTest/Yves/Customer +# - tests/PyzTest/Yves/Newsletter +# - tests/PyzTest/Zed/Calculation +# - tests/PyzTest/Zed/CmsGui +# - tests/PyzTest/Zed/Console +# - tests/PyzTest/Zed/NavigationGui +# - tests/PyzTest/Zed/Product +# - tests/PyzTest/Zed/ProductOption +# - tests/PyzTest/Zed/ProductRelation +# - tests/PyzTest/Zed/Tax +# - tests/PyzTest/Zed/Touch # - vendor/spryker/spryker/Bundles/*/* paths: + tests: tests log: tests/_output data: tests/_data support: tests/_support diff --git a/tests/PyzTest/Yves/Customer/Presentation/CustomerAddressCest.php b/tests/PyzTest/Yves/Customer/Presentation/CustomerAddressCest.php index 2a8c5901e..d7dc478e4 100644 --- a/tests/PyzTest/Yves/Customer/Presentation/CustomerAddressCest.php +++ b/tests/PyzTest/Yves/Customer/Presentation/CustomerAddressCest.php @@ -5,7 +5,7 @@ * For full license information, please view the LICENSE file that was distributed with this source code. */ -namespace PyzTest\Yves\Customer\Yves; +namespace PyzTest\Yves\Customer\Presentation; use PyzTest\Yves\Customer\CustomerPresentationTester; use PyzTest\Yves\Customer\PageObject\CustomerAddressesPage; @@ -16,7 +16,7 @@ * @group PyzTest * @group Yves * @group Customer - * @group Yves + * @group Presentation * @group CustomerAddressCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Yves/Customer/Presentation/CustomerAddressesCest.php b/tests/PyzTest/Yves/Customer/Presentation/CustomerAddressesCest.php index ba896fbcf..8df969632 100644 --- a/tests/PyzTest/Yves/Customer/Presentation/CustomerAddressesCest.php +++ b/tests/PyzTest/Yves/Customer/Presentation/CustomerAddressesCest.php @@ -5,7 +5,7 @@ * For full license information, please view the LICENSE file that was distributed with this source code. */ -namespace PyzTest\Yves\Customer\Yves; +namespace PyzTest\Yves\Customer\Presentation; use PyzTest\Yves\Customer\CustomerPresentationTester; use PyzTest\Yves\Customer\PageObject\CustomerAddressesPage; @@ -16,7 +16,7 @@ * @group PyzTest * @group Yves * @group Customer - * @group Yves + * @group Presentation * @group CustomerAddressesCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Yves/Customer/Presentation/CustomerLoginCest.php b/tests/PyzTest/Yves/Customer/Presentation/CustomerLoginCest.php index cfa92234d..682371f55 100644 --- a/tests/PyzTest/Yves/Customer/Presentation/CustomerLoginCest.php +++ b/tests/PyzTest/Yves/Customer/Presentation/CustomerLoginCest.php @@ -5,7 +5,7 @@ * For full license information, please view the LICENSE file that was distributed with this source code. */ -namespace PyzTest\Yves\Customer\Yves; +namespace PyzTest\Yves\Customer\Presentation; use PyzTest\Yves\Customer\CustomerPresentationTester; use PyzTest\Yves\Customer\PageObject\CustomerLoginPage; @@ -17,7 +17,7 @@ * @group PyzTest * @group Yves * @group Customer - * @group Yves + * @group Presentation * @group CustomerLoginCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Yves/Customer/Presentation/CustomerLogoutCest.php b/tests/PyzTest/Yves/Customer/Presentation/CustomerLogoutCest.php index 37d6fc23d..224449997 100644 --- a/tests/PyzTest/Yves/Customer/Presentation/CustomerLogoutCest.php +++ b/tests/PyzTest/Yves/Customer/Presentation/CustomerLogoutCest.php @@ -5,7 +5,7 @@ * For full license information, please view the LICENSE file that was distributed with this source code. */ -namespace PyzTest\Yves\Customer\Yves; +namespace PyzTest\Yves\Customer\Presentation; use PyzTest\Yves\Customer\CustomerPresentationTester; use PyzTest\Yves\Customer\PageObject\CustomerLoginPage; @@ -17,7 +17,7 @@ * @group PyzTest * @group Yves * @group Customer - * @group Yves + * @group Presentation * @group CustomerLogoutCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Yves/Customer/Presentation/CustomerNewsletterCest.php b/tests/PyzTest/Yves/Customer/Presentation/CustomerNewsletterCest.php index ab8716c73..2912fbcf5 100644 --- a/tests/PyzTest/Yves/Customer/Presentation/CustomerNewsletterCest.php +++ b/tests/PyzTest/Yves/Customer/Presentation/CustomerNewsletterCest.php @@ -5,7 +5,7 @@ * For full license information, please view the LICENSE file that was distributed with this source code. */ -namespace PyzTest\Yves\Customer\Yves; +namespace PyzTest\Yves\Customer\Presentation; use Codeception\Util\Stub; use PyzTest\Yves\Customer\CustomerPresentationTester; @@ -18,7 +18,7 @@ * @group PyzTest * @group Yves * @group Customer - * @group Yves + * @group Presentation * @group CustomerNewsletterCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Yves/Customer/Presentation/CustomerOverviewCest.php b/tests/PyzTest/Yves/Customer/Presentation/CustomerOverviewCest.php index 4aa64f7c1..8d824d8f4 100644 --- a/tests/PyzTest/Yves/Customer/Presentation/CustomerOverviewCest.php +++ b/tests/PyzTest/Yves/Customer/Presentation/CustomerOverviewCest.php @@ -5,7 +5,7 @@ * For full license information, please view the LICENSE file that was distributed with this source code. */ -namespace PyzTest\Yves\Customer\Yves; +namespace PyzTest\Yves\Customer\Presentation; use PyzTest\Yves\Customer\CustomerPresentationTester; use PyzTest\Yves\Customer\PageObject\CustomerAddressesPage; @@ -19,7 +19,7 @@ * @group PyzTest * @group Yves * @group Customer - * @group Yves + * @group Presentation * @group CustomerOverviewCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Yves/Customer/Presentation/CustomerProfileCest.php b/tests/PyzTest/Yves/Customer/Presentation/CustomerProfileCest.php index b206774fb..cccc47134 100644 --- a/tests/PyzTest/Yves/Customer/Presentation/CustomerProfileCest.php +++ b/tests/PyzTest/Yves/Customer/Presentation/CustomerProfileCest.php @@ -5,7 +5,7 @@ * For full license information, please view the LICENSE file that was distributed with this source code. */ -namespace PyzTest\Yves\Customer\Yves; +namespace PyzTest\Yves\Customer\Presentation; use PyzTest\Yves\Customer\CustomerPresentationTester; use PyzTest\Yves\Customer\PageObject\CustomerProfilePage; @@ -15,7 +15,7 @@ * @group PyzTest * @group Yves * @group Customer - * @group Yves + * @group Presentation * @group CustomerProfileCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Yves/Customer/Presentation/CustomerRegistrationCest.php b/tests/PyzTest/Yves/Customer/Presentation/CustomerRegistrationCest.php index c08107df9..afc6d2861 100644 --- a/tests/PyzTest/Yves/Customer/Presentation/CustomerRegistrationCest.php +++ b/tests/PyzTest/Yves/Customer/Presentation/CustomerRegistrationCest.php @@ -5,7 +5,7 @@ * For full license information, please view the LICENSE file that was distributed with this source code. */ -namespace PyzTest\Yves\Customer\Yves; +namespace PyzTest\Yves\Customer\Presentation; use PyzTest\Yves\Customer\CustomerPresentationTester; use PyzTest\Yves\Customer\PageObject\CustomerOverviewPage; @@ -16,7 +16,7 @@ * @group PyzTest * @group Yves * @group Customer - * @group Yves + * @group Presentation * @group CustomerRegistrationCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Yves/Newsletter/Presentation/NewsletterSubscriptionCest.php b/tests/PyzTest/Yves/Newsletter/Presentation/NewsletterSubscriptionCest.php index d4f425011..717bb5b68 100644 --- a/tests/PyzTest/Yves/Newsletter/Presentation/NewsletterSubscriptionCest.php +++ b/tests/PyzTest/Yves/Newsletter/Presentation/NewsletterSubscriptionCest.php @@ -5,7 +5,7 @@ * Use of this software requires Presentation of the Evaluation License Agreement. See LICENSE file. */ -namespace PyzTest\Yves\Newsletter\Yves; +namespace PyzTest\Yves\Newsletter\Presentation; use Generated\Shared\DataBuilder\CustomerBuilder; use PyzTest\Yves\Application\PageObject\Homepage; @@ -19,7 +19,7 @@ * @group PyzTest * @group Yves * @group Newsletter - * @group Yves + * @group Presentation * @group NewsletterSubscriptionCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Zed/CmsGui/Presentation/CmsGuiCreatePageCest.php b/tests/PyzTest/Zed/CmsGui/Presentation/CmsGuiCreatePageCest.php index 3b6146083..a70908596 100644 --- a/tests/PyzTest/Zed/CmsGui/Presentation/CmsGuiCreatePageCest.php +++ b/tests/PyzTest/Zed/CmsGui/Presentation/CmsGuiCreatePageCest.php @@ -4,8 +4,9 @@ * Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. */ -namespace PyzTest\Zed\CmsGui; +namespace PyzTest\Zed\CmsGui\Presentation; +use PyzTest\Zed\CmsGui\CmsGuiPresentationTester; use PyzTest\Zed\CmsGui\PageObject\CmsCreateGlossaryPage; use PyzTest\Zed\CmsGui\PageObject\CmsCreatePage; use PyzTest\Zed\CmsGui\PageObject\CmsEditPage; @@ -15,6 +16,7 @@ * @group PyzTest * @group Zed * @group CmsGui + * @group Presentation * @group CmsGuiCreatePageCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Zed/CmsGui/Presentation/CmsGuiPageListCest.php b/tests/PyzTest/Zed/CmsGui/Presentation/CmsGuiPageListCest.php index b7cb98760..0fce83614 100644 --- a/tests/PyzTest/Zed/CmsGui/Presentation/CmsGuiPageListCest.php +++ b/tests/PyzTest/Zed/CmsGui/Presentation/CmsGuiPageListCest.php @@ -4,7 +4,9 @@ * Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. */ -namespace PyzTest\Zed\CmsGui\Acceptance; +namespace PyzTest\Zed\CmsGui\Presentation; + +; use PyzTest\Zed\CmsGui\CmsGuiPresentationTester; use PyzTest\Zed\CmsGui\PageObject\CmsListPage; @@ -14,7 +16,7 @@ * @group PyzTest * @group Zed * @group CmsGui - * @group Acceptance + * @group Presentation * @group CmsGuiPageListCest * Add your own group annotations below this line */ diff --git a/tests/PyzTest/Zed/Tax/Presentation/Tester/TaxRateTester.php b/tests/PyzTest/Zed/Tax/Presentation/Tester/TaxRateTester.php deleted file mode 100644 index 9e0408a53..000000000 --- a/tests/PyzTest/Zed/Tax/Presentation/Tester/TaxRateTester.php +++ /dev/null @@ -1,172 +0,0 @@ -fillTaxRateForm($taxRateName); - $i->click(TaxRateCreatePage::SELECTOR_SAVE); - } - - /** - * @param string $taxRateName - * - * @return void - */ - protected function fillTaxRateForm($taxRateName) - { - $i = $this; - - $i->amLoggedInUser(); - $i->amOnPage(TaxRateCreatePage::URL); - - $i->wait(4); - - $i->fillField(TaxRateCreatePage::SELECTOR_NAME, TaxRateCreatePage::$taxRateData[$taxRateName]['name']); - $i->selectOption(TaxRateCreatePage::SELECTOR_COUNTRY, TaxRateCreatePage::$taxRateData[$taxRateName]['country']); - $i->fillField(TaxRateCreatePage::SELECTOR_PERCENTAGE, TaxRateCreatePage::$taxRateData[$taxRateName]['percentage']); - } - - /** - * @param string $taxRateName - * - * @return $this - */ - public function createTaxRateWithoutSaving($taxRateName) - { - $i = $this; - $i->fillTaxRateForm($taxRateName); - } - - /** - * @param string $taxRateName - * - * @return $this - */ - public function searchForTaxRate($taxRateName) - { - $i = $this; - - $i->fillField(TaxRateListPage::SELECTOR_SEARCH, TaxRateCreatePage::$taxRateData[$taxRateName]['name']); - } - - /** - * @param string $taxRateName - * - * @return $this - */ - public function deleteTaxRate($taxRateName) - { - $i = $this; - - $i->amLoggedInUser(); - $i->amOnPage(TaxRateListPage::URL); - - $i->fillField(TaxRateListPage::SELECTOR_SEARCH, TaxRateCreatePage::$taxRateData[$taxRateName]['name']); - $i->click(TaxRateListPage::SELECTOR_DELETE); - } - - /** - * @return $this - */ - public function seeErrorMessages() - { - $i = $this; - - $i->see(TaxRateCreatePage::ERROR_MESSAGE_NAME_SHOULD_NOT_BE_BLANK); - $i->see(TaxRateCreatePage::ERROR_MESSAGE_COUNTRY_SHOULD_NOT_BE_BLANK); - $i->see(TaxRateCreatePage::ERROR_MESSAGE_PERCENTAGE_SHOULD_BE_VALID_NUMBER); - } - - /** - * @param string $taxRateName - * - * @return $this - */ - public function createOneAndTheSameTaxRate($taxRateName) - { - $i = $this; - - $i->amLoggedInUser(); - $i->amOnPage(TaxRateCreatePage::URL); - - $i->wait(4); - - $i->fillField(TaxRateCreatePage::SELECTOR_NAME, TaxRateCreatePage::$taxRateData[$taxRateName]['name']); - $i->selectOption(TaxRateCreatePage::SELECTOR_COUNTRY, TaxRateCreatePage::$taxRateData[$taxRateName]['country']); - $i->fillField(TaxRateCreatePage::SELECTOR_PERCENTAGE, TaxRateCreatePage::$taxRateData[$taxRateName]['percentage']); - - $i->click(TaxRateCreatePage::SELECTOR_SAVE); - - $i->amOnPage(TaxRateCreatePage::URL); - - $i->wait(2); - - $i->fillField(TaxRateCreatePage::SELECTOR_NAME, TaxRateCreatePage::$taxRateData[$taxRateName]['name']); - $i->selectOption(TaxRateCreatePage::SELECTOR_COUNTRY, TaxRateCreatePage::$taxRateData[$taxRateName]['country']); - $i->fillField(TaxRateCreatePage::SELECTOR_PERCENTAGE, TaxRateCreatePage::$taxRateData[$taxRateName]['percentage']); - - $i->click(TaxRateCreatePage::SELECTOR_SAVE); - } - - /** - * @param string $taxRateName - * - * @return $this - */ - public function editTaxRateWithValidData($taxRateName) - { - $i = $this; - - $i->fillField(TaxRateCreatePage::SELECTOR_NAME, TaxRateCreatePage::$taxRateData[$taxRateName]['name']); - $i->selectOption(TaxRateCreatePage::SELECTOR_COUNTRY, TaxRateCreatePage::$taxRateData[$taxRateName]['country']); - $i->fillField(TaxRateCreatePage::SELECTOR_PERCENTAGE, TaxRateCreatePage::$taxRateData[$taxRateName]['percentage']); - - $i->click(TaxRateCreatePage::SELECTOR_SAVE); - } - - /** - * @return $this - */ - public function deleteTaxRateFromEditForm() - { - $i = $this; - - $i->click(TaxRateCreatePage::SELECTOR_DELETE_FROM_EDIT); - } - - /** - * @param string $taxRateName - * - * @return void - */ - public function removeTaxRateFromDatabase($taxRateName) - { - $taxRateQuery = new SpyTaxRateQuery(); - $taxRateEntity = $taxRateQuery->findOneByName(TaxRateCreatePage::$taxRateData[$taxRateName]['name']); - if ($taxRateEntity) { - $taxRateEntity->delete(); - } - } - -}