diff --git a/composer.json b/composer.json index cc4cec5496..4319d1f794 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ }, "require-dev": { "codeception/codeception": "*", - "codeception/specify": "*", "codeception/verify": "*", "codegyre/robo": "*", "vlucas/phpdotenv": "*", diff --git a/composer.lock b/composer.lock index ae1f865b8f..08f37dbb15 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "75f86219faf839eada880703b2e11994", + "hash": "4b157c8484b1247df06b05f728db16bc", "packages": [ { "name": "cerdic/css-tidy", @@ -368,26 +368,26 @@ "packages-dev": [ { "name": "codeception/codeception", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "6c22380326421947fba0d6116c13a5c24d214adb" + "reference": "521adbb2ee34e9debdd8508a2c41ab2b5c2f042b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/6c22380326421947fba0d6116c13a5c24d214adb", - "reference": "6c22380326421947fba0d6116c13a5c24d214adb", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/521adbb2ee34e9debdd8508a2c41ab2b5c2f042b", + "reference": "521adbb2ee34e9debdd8508a2c41ab2b5c2f042b", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "facebook/webdriver": "~1.0", + "facebook/webdriver": ">=1.0.1", "guzzlehttp/guzzle": ">=4.0|<7.0", "guzzlehttp/psr7": "~1.0", "php": ">=5.4.0", - "phpunit/phpunit": "~4.7.0", + "phpunit/phpunit": "~4.8.0", "symfony/browser-kit": "~2.4", "symfony/console": "~2.4", "symfony/css-selector": "~2.4", @@ -444,44 +444,7 @@ "functional testing", "unit testing" ], - "time": "2015-07-14 11:24:17" - }, - { - "name": "codeception/specify", - "version": "0.4.1", - "source": { - "type": "git", - "url": "https://github.com/Codeception/Specify.git", - "reference": "0c0ae07adfc231115b3b72ade22f44c23c199ded" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Codeception/Specify/zipball/0c0ae07adfc231115b3b72ade22f44c23c199ded", - "reference": "0c0ae07adfc231115b3b72ade22f44c23c199ded", - "shasum": "" - }, - "require": { - "myclabs/deep-copy": "~1.1", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Codeception\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "authors": [ - { - "name": "Michael Bodnarchuk", - "email": "davert.php@mailican.com" - } - ], - "description": "BDD code blocks for PHPUnit and Codeception", - "time": "2014-10-17 00:06:51" + "time": "2015-08-09 13:48:55" }, { "name": "codeception/verify", @@ -897,48 +860,6 @@ ], "time": "2013-05-24 06:47:29" }, - { - "name": "myclabs/deep-copy", - "version": "1.3.1", - "source": { - "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "95d662954e06000cdf63ec9c9f0a6c598d9c5eb9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/95d662954e06000cdf63ec9c9f0a6c598d9c5eb9", - "reference": "95d662954e06000cdf63ec9c9f0a6c598d9c5eb9", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "doctrine/collections": "1.*", - "phpunit/phpunit": "~4.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Create deep copies (clones) of your objects", - "homepage": "https://github.com/myclabs/DeepCopy", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" - ], - "time": "2015-07-19 19:57:13" - }, { "name": "phpdocumentor/reflection-docblock", "version": "2.0.4", @@ -1290,16 +1211,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.7.7", + "version": "4.8.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9b97f9d807b862c2de2a36e86690000801c85724" + "reference": "748c6963c0a8c983fa69ee8884c885d0e98209bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b97f9d807b862c2de2a36e86690000801c85724", - "reference": "9b97f9d807b862c2de2a36e86690000801c85724", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/748c6963c0a8c983fa69ee8884c885d0e98209bf", + "reference": "748c6963c0a8c983fa69ee8884c885d0e98209bf", "shasum": "" }, "require": { @@ -1309,7 +1230,7 @@ "ext-reflection": "*", "ext-spl": "*", "php": ">=5.3.3", - "phpspec/prophecy": "~1.3,>=1.3.1", + "phpspec/prophecy": "^1.3.1", "phpunit/php-code-coverage": "~2.1", "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", @@ -1317,7 +1238,7 @@ "phpunit/phpunit-mock-objects": "~2.3", "sebastian/comparator": "~1.1", "sebastian/diff": "~1.2", - "sebastian/environment": "~1.2", + "sebastian/environment": "~1.3", "sebastian/exporter": "~1.2", "sebastian/global-state": "~1.0", "sebastian/version": "~1.0", @@ -1332,7 +1253,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.7.x-dev" + "dev-master": "4.8.x-dev" } }, "autoload": { @@ -1358,7 +1279,7 @@ "testing", "xunit" ], - "time": "2015-07-13 11:28:34" + "time": "2015-08-07 12:56:50" }, { "name": "phpunit/phpunit-mock-objects", diff --git a/tests/acceptance/ActivationCest.php b/tests/acceptance/ActivationCest.php index 0f3c466fb2..066b325201 100644 --- a/tests/acceptance/ActivationCest.php +++ b/tests/acceptance/ActivationCest.php @@ -3,22 +3,22 @@ use \AcceptanceTester; class ActivationCest { - public function _before(AcceptanceTester $I) { - $I->login(); - } + public function _before(AcceptanceTester $I) { + $I->login(); + } - public function iCanActivate(AcceptanceTester $I) { - $I->amOnPage('/wp-admin/plugins.php'); + public function iCanActivate(AcceptanceTester $I) { + $I->amOnPage('/wp-admin/plugins.php'); - $I->see('MailPoet'); - $I->click('#mailpoet .deactivate a'); - $I->see('Plugin deactivated'); + $I->see('MailPoet'); + $I->click('#mailpoet .deactivate a'); + $I->see('Plugin deactivated'); - $I->see('MailPoet'); - $I->click('#mailpoet .activate a'); - $I->see('Plugin Activated'); - } + $I->see('MailPoet'); + $I->click('#mailpoet .activate a'); + $I->see('Plugin Activated'); + } - public function _after(AcceptanceTester $I) { - } + public function _after(AcceptanceTester $I) { + } } diff --git a/tests/acceptance/HomePageCest.php b/tests/acceptance/HomePageCest.php index e3da7b5680..20e75b6556 100644 --- a/tests/acceptance/HomePageCest.php +++ b/tests/acceptance/HomePageCest.php @@ -3,14 +3,14 @@ use \AcceptanceTester; class HomePageCest { - public function _before(AcceptanceTester $I) { - } + function _before(AcceptanceTester $I) { + } - public function iCanSeeATitle(AcceptanceTester $I) { - $I->amOnPage('/'); - $I->see('Hello'); - } + function iCanSeeATitle(AcceptanceTester $I) { + $I->amOnPage('/'); + $I->see('Hello'); + } - public function _after(AcceptanceTester $I) { - } + function _after(AcceptanceTester $I) { + } } diff --git a/tests/acceptance/SettingsPageCest.php b/tests/acceptance/SettingsPageCest.php new file mode 100644 index 0000000000..ca06467560 --- /dev/null +++ b/tests/acceptance/SettingsPageCest.php @@ -0,0 +1,24 @@ +login(); + } + + function iCanSeeTheSettingsPage(AcceptanceTester $I) { + $I->amOnPage('/wp-admin/admin.php?page=mailpoet-settings'); + $I->see('Settings'); + } + + function iCanGoToSettingsFromWelcomePage(AcceptanceTester $I) { + $I->amOnPage('/wp-admin/admin.php?page=mailpoet'); + $I->see('Welcome!'); + $I->click('Setup'); + $I->see('Settings'); + } + + function _after(AcceptanceTester $I) { + } +} diff --git a/tests/acceptance/WelcomePageCest.php b/tests/acceptance/WelcomePageCest.php new file mode 100644 index 0000000000..d0e24d6981 --- /dev/null +++ b/tests/acceptance/WelcomePageCest.php @@ -0,0 +1,17 @@ +login(); + } + + function iCanSeeTheWelcomePage(AcceptanceTester $I) { + $I->amOnPage('/wp-admin/admin.php?page=mailpoet'); + $I->see('Welcome!'); + } + + function _after(AcceptanceTester $I) { + } +}