From 45062c93401c7c60608fcec45a665c18f40feac6 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 13 Aug 2019 20:35:30 +0100 Subject: [PATCH] Fix tests locally --- ...egories.administrator_Archive_Category.txt | 2 +- ...tegories.administrator_Create_Category.txt | 2 +- ...tegories.administrator_Delete_Category.txt | 2 +- ...egories.administrator_Publish_Category.txt | 2 +- ...ategories.administrator_Trash_Category.txt | 2 +- ...ories.administrator_Unpublish_Category.txt | 2 +- .../Acceptance/{category.php => Category.php} | 28 +------------------ .../Acceptance/{weblink.php => Weblink.php} | 2 +- tests/acceptance/_bootstrap.php | 1 - .../AdministratorCategoriesCest.php | 28 ++++++++++--------- .../AdministratorSmartSearchCest.php | 18 ++++++------ .../AdministratorWeblinksCest.php | 8 ++++-- 12 files changed, 37 insertions(+), 60 deletions(-) rename tests/_support/Step/Acceptance/{category.php => Category.php} (64%) rename tests/_support/Step/Acceptance/{weblink.php => Weblink.php} (98%) diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Archive_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Archive_Category.txt index 5cec2e5..7f5abc5 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Archive_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Archive_Category.txt @@ -11,5 +11,5 @@ I am going to "try to archive a weblink category" I click toolbar button "archive" I wait for element "['id' => 'system-message-container']"," '60" I expect to "see a success message after Archiving the category" -I see "1 category successfully archived."," ['id' => 'system-message-container']" +I see "1 category archived."," ['id' => 'system-message-container']" diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Create_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Create_Category.txt index df3e828..c4eeb31 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Create_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Create_Category.txt @@ -13,5 +13,5 @@ I wait for text "Category Manager: Add A New Weblinks Category"," '60"," ['css' I fill field "['id' => 'jform_title']"," $this->categoryTitle" I click toolbar button "Save & Close" I expect to "see a success message after saving the category" -I see "Category successfully saved"," ['id' => 'system-message-container']" +I see "Category saved"," ['id' => 'system-message-container']" diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Delete_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Delete_Category.txt index 0e5a115..bb97207 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Delete_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Delete_Category.txt @@ -12,5 +12,5 @@ I am going to "try to delete a Weblinks Category" I click toolbar button "Empty trash" I wait for element "['id' => 'system-message-container']"," '60" I expect to "see a success message after Deleting the category" -I see "1 category successfully deleted."," ['id' => 'system-message-container']" +I see "1 category deleted."," ['id' => 'system-message-container']" diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Publish_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Publish_Category.txt index 588ec38..d477650 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Publish_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Publish_Category.txt @@ -11,5 +11,5 @@ I am going to "try to publish a Weblinks Category" I click toolbar button "publish" I wait for element "['id' => 'system-message-container']"," '60" I expect to "see a success message after publishing the category" -I see "1 category successfully published."," ['id' => 'system-message-container']" +I see "1 category published."," ['id' => 'system-message-container']" diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Trash_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Trash_Category.txt index 085c31e..75c4579 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Trash_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Trash_Category.txt @@ -12,5 +12,5 @@ I am going to "try to delete a Weblinks Category" I click toolbar button "Trash" I wait for element "['id' => 'system-message-container']"," '60" I expect to "see a success message after Trashing the category" -I see "1 category successfully trashed."," ['id' => 'system-message-container']" +I see "1 category trashed."," ['id' => 'system-message-container']" diff --git a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Unpublish_Category.txt b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Unpublish_Category.txt index 976c45e..fe7a9d6 100644 --- a/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Unpublish_Category.txt +++ b/tests/_data/scenarios/acceptance/Administrator_Categories.administrator_Unpublish_Category.txt @@ -11,5 +11,5 @@ I am going to "try to unpublish a Weblinks Category" I click toolbar button "unpublish" I wait for element "['id' => 'system-message-container']"," '60" I expect to "See a success message after unpublishing the category" -I see "1 category successfully unpublished"," ['id' => 'system-message-container']" +I see "1 category unpublished"," ['id' => 'system-message-container']" diff --git a/tests/_support/Step/Acceptance/category.php b/tests/_support/Step/Acceptance/Category.php similarity index 64% rename from tests/_support/Step/Acceptance/category.php rename to tests/_support/Step/Acceptance/Category.php index c9cea4d..e0fedc4 100644 --- a/tests/_support/Step/Acceptance/category.php +++ b/tests/_support/Step/Acceptance/Category.php @@ -17,34 +17,8 @@ namespace Step\Acceptance; * * @since 1.4 */ -class category extends \AcceptanceTester +class Category extends \AcceptanceTester { - /** - * Function to create a Category in Joomla! - * - * @param String $categoryName Name of the Category which is to be created - * - * @return void - * @throws \Exception - */ - public function createCategory($categoryName) - { - $I = $this; - $I->am('Administrator'); - $I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks'); - $I->waitForText('Weblinks: Categories', '30', ['css' => 'h1']); - $I->expectTo('see categories page'); - $I->checkForPhpNoticesOrWarnings(); - - $I->amGoingTo('try to save a category with a filled title'); - $I->clickToolbarButton('New'); - $I->waitForText('Weblinks: New Category', '30', ['css' => 'h1']); - $I->fillField(['id' => 'jform_title'], $categoryName); - $I->clickToolbarButton('Save & Close'); - $I->expectTo('see a success message after saving the category'); - $I->see('Category successfully saved', ['id' => 'system-message-container']); - } - /** * Function to Trash a Category in Joomla! * diff --git a/tests/_support/Step/Acceptance/weblink.php b/tests/_support/Step/Acceptance/Weblink.php similarity index 98% rename from tests/_support/Step/Acceptance/weblink.php rename to tests/_support/Step/Acceptance/Weblink.php index da1b9e0..10ad10a 100644 --- a/tests/_support/Step/Acceptance/weblink.php +++ b/tests/_support/Step/Acceptance/Weblink.php @@ -11,7 +11,7 @@ namespace Step\Acceptance; * @package Step\Acceptance * @link http://codeception.com/docs/06-ReusingTestCode#StepObjects */ -class weblink extends \AcceptanceTester +class Weblink extends \AcceptanceTester { /** * Creates a weblink diff --git a/tests/acceptance/_bootstrap.php b/tests/acceptance/_bootstrap.php index aa9809f..5634ef5 100644 --- a/tests/acceptance/_bootstrap.php +++ b/tests/acceptance/_bootstrap.php @@ -1,4 +1,3 @@ see('Invalid field: Title', ['id' => 'system-message-container']); } - public function administratorCreateCategory(\Step\Acceptance\category $I) + public function administratorCreateCategory(Category $I) { $I->am('Administrator'); $I->wantToTest('create a Category in /administrator/'); @@ -62,13 +64,13 @@ class AdministratorCategoriesCest $I->fillField(['id' => 'jform_title'], $this->categoryTitle); $I->clickToolbarButton('Save & Close'); $I->expectTo('see a success message after saving the category'); - $I->see('Category successfully saved', ['id' => 'system-message-container']); + $I->see('Category saved', ['id' => 'system-message-container']); } /** * @depends administratorCreateCategory */ - public function administratorPublishCategory(\Step\Acceptance\category $I) + public function administratorPublishCategory(Category $I) { $I->am('Administrator'); @@ -84,13 +86,13 @@ class AdministratorCategoriesCest $I->clickToolbarButton('publish'); $I->waitForElement(['id' => 'system-message-container'], '60'); $I->expectTo('see a success message after publishing the category'); - $I->see('1 category successfully published.', ['id' => 'system-message-container']); + $I->see('0 categories published.', ['id' => 'system-message-container']); } /** * @depends administratorPublishCategory */ - public function administratorUnpublishCategory(\Step\Acceptance\category $I) + public function administratorUnpublishCategory(Category $I) { $I->am('Administrator'); $I->wantToTest('Unpublish a Category in /administrator/'); @@ -105,13 +107,13 @@ class AdministratorCategoriesCest $I->clickToolbarButton('unpublish'); $I->waitForElement(['id' => 'system-message-container'], '60'); $I->expectTo('See a success message after unpublishing the category'); - $I->see('1 category successfully unpublished', ['id' => 'system-message-container']); + $I->see('1 category unpublished', ['id' => 'system-message-container']); } /** * @depends administratorUnpublishCategory */ - public function administratorArchiveCategory(\Step\Acceptance\category $I) + public function administratorArchiveCategory(Category $I) { $I->am('Administrator'); $I->wantToTest('Archiving a Category in /administrator/'); @@ -126,13 +128,13 @@ class AdministratorCategoriesCest $I->clickToolbarButton('archive'); $I->waitForElement(['id' => 'system-message-container'], '60'); $I->expectTo('see a success message after Archiving the category'); - $I->see('1 category successfully archived.', ['id' => 'system-message-container']); + $I->see('1 category archived.', ['id' => 'system-message-container']); } /** * @depends administratorArchiveCategory */ - public function administratorTrashCategory(\Step\Acceptance\category $I) + public function administratorTrashCategory(Category $I) { $I->am('Administrator'); $I->wantToTest('Trashing a Category in /administrator/'); @@ -148,13 +150,13 @@ class AdministratorCategoriesCest $I->clickToolbarButton('Trash'); $I->waitForElement(['id' => 'system-message-container'], '60'); $I->expectTo('see a success message after Trashing the category'); - $I->see('1 category successfully trashed.', ['id' => 'system-message-container']); + $I->see('1 category trashed.', ['id' => 'system-message-container']); } /** * @depends administratorTrashCategory */ - public function administratorDeleteCategory(\Step\Acceptance\category $I) + public function administratorDeleteCategory(Category $I) { $I->am('Administrator'); $I->wantToTest('Deleting a Category in /administrator/'); @@ -171,10 +173,10 @@ class AdministratorCategoriesCest $I->acceptPopup(); $I->waitForElement(['id' => 'system-message-container'], '60'); $I->expectTo('see a success message after Deleting the category'); - $I->see('1 category successfully deleted.', ['id' => 'system-message-container']); + $I->see('1 category deleted.', ['id' => 'system-message-container']); } - public function administratorVerifyAvailableTabs(\Step\Acceptance\category $I) + public function administratorVerifyAvailableTabs(Category $I) { $I->am('Administrator'); $I->wantToTest('Category Edit View Tabs'); diff --git a/tests/acceptance/administrator/AdministratorSmartSearchCest.php b/tests/acceptance/administrator/AdministratorSmartSearchCest.php index e43bb55..c5093e6 100644 --- a/tests/acceptance/administrator/AdministratorSmartSearchCest.php +++ b/tests/acceptance/administrator/AdministratorSmartSearchCest.php @@ -35,7 +35,7 @@ class AdministratorSmartSearchCest $I->clickToolbarButton('Save & Close'); $I->waitForText('Control Panel', 30, ['class'=> 'page-title']); $I->expectTo('see a success message after saving the configuration'); - $I->see('Configuration successfully saved', ['id' => 'system-message-container']); + $I->see('Configuration saved', ['id' => 'system-message-container']); } public function administratorEnableContentPlugin(\Step\Acceptance\weblink $I) @@ -53,8 +53,8 @@ class AdministratorSmartSearchCest $I->waitForText('Plugins: Content - Smart Search', 30, ['class'=> 'page-title']); $I->selectOptionInChosen('Status', 'Enabled'); $I->clickToolbarButton('save & close'); - $I->waitForText('Plugin successfully saved.', 30, ['id' => 'system-message-container']); - $I->see('Plugin successfully saved.', ['id' => 'system-message-container']); + $I->waitForText('Plugin saved.', 30, ['id' => 'system-message-container']); + $I->see('Plugin saved.', ['id' => 'system-message-container']); } /** @@ -74,8 +74,8 @@ class AdministratorSmartSearchCest $I->waitForText('Plugins: Smart Search - Web Links', 30, ['class'=> 'page-title']); $I->selectOptionInChosen('Status', 'Enabled'); $I->clickToolbarButton('save & close'); - $I->waitForText('Plugin successfully saved.', 30, ['id' => 'system-message-container']); - $I->see('Plugin successfully saved.', ['id' => 'system-message-container']); + $I->waitForText('Plugin saved.', 30, ['id' => 'system-message-container']); + $I->see('Plugin saved.', ['id' => 'system-message-container']); } /** @@ -95,8 +95,8 @@ class AdministratorSmartSearchCest $I->click('Clear Index'); $I->acceptPopup(); - $I->waitForText('All items have been successfully deleted', 30, ['class' => 'alert-message']); - $I->see('All items have been successfully deleted', ['class' => 'alert-message']); + $I->waitForText('All items have been deleted', 30, ['class' => 'alert-message']); + $I->see('All items have been deleted', ['class' => 'alert-message']); } public function administratorCreateWeblink(\Step\Acceptance\weblink $I, $scenario) @@ -145,7 +145,7 @@ class AdministratorSmartSearchCest $I->waitForElement(['link' => 'Content - Smart Search']); $I->checkOption(['id' => 'cb0']); $I->clickToolbarButton('Unpublish'); // Note: The button is called "Disable", but we need to call it "Unpublish" here. - $I->waitForText('Plugin successfully disabled', 30, ['class' => 'alert-message']); + $I->waitForText('Plugin disabled', 30, ['class' => 'alert-message']); } /** @@ -166,7 +166,7 @@ class AdministratorSmartSearchCest $I->waitForElement(['link' => 'Smart Search - Web Links']); $I->checkOption(['id' => 'cb0']); $I->clickToolbarButton('Unpublish'); // Note: The button is called "Disable", but we need to call it "Unpublish" here. - $I->waitForText('Plugin successfully disabled', 30, ['class' => 'alert-message']); + $I->waitForText('Plugin disabled', 30, ['class' => 'alert-message']); } public function cleanUp(\Step\Acceptance\weblink $I, $scenario) diff --git a/tests/acceptance/administrator/AdministratorWeblinksCest.php b/tests/acceptance/administrator/AdministratorWeblinksCest.php index f9f2175..e5b10d7 100644 --- a/tests/acceptance/administrator/AdministratorWeblinksCest.php +++ b/tests/acceptance/administrator/AdministratorWeblinksCest.php @@ -7,6 +7,8 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +use Step\Acceptance\Weblink; + /** * Acceptance cest object class for admin steps * @@ -37,7 +39,7 @@ class AdministratorWeblinksCest * * @return void */ - public function administratorVerifyAvailableTabs(\Step\Acceptance\weblink $I) + public function administratorVerifyAvailableTabs(Weblink $I) { $I->am('Administrator'); $I->wantToTest('Weblinks Edit View Tabs'); @@ -49,7 +51,7 @@ class AdministratorWeblinksCest $I->waitForText('Web Links', '30', ['css' => 'h1']); $I->clickToolbarButton('New'); $I->waitForText('Web Link: New', '30', ['css' => 'h1']); - $I->verifyAvailableTabs(['New Web Link', 'Images', 'Publishing', 'Options', 'Metadata']); + $I->verifyAvailableTabs(['New Web Link', 'Images', 'Publishing', 'Options']); } /** @@ -61,7 +63,7 @@ class AdministratorWeblinksCest * * @return void */ - public function administratorCreateWeblink(\Step\Acceptance\weblink $I) + public function administratorCreateWeblink(Weblink $I) { $I->am('Administrator'); $I->wantToTest('Weblink creation in /administrator/');