Skip to content
This repository has been archived by the owner on Feb 4, 2019. It is now read-only.

Commit

Permalink
merge project into demoshop.
Browse files Browse the repository at this point in the history
  • Loading branch information
dereuromark committed Apr 18, 2017
1 parent 77dda7e commit 2f78ed3
Show file tree
Hide file tree
Showing 29 changed files with 967 additions and 249 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ before_script:
- cp config/Shared/ci/travis/params_test_env.sh deploy/setup/params_test_env.sh

- if [[ $TEST_GROUP == 'acceptance' ]]; then config/Shared/ci/travis/acceptance_env.sh; fi
- if [[ $TEST_GROUP == 'acceptance' ]]; then ./setup_test -f; fi
- if [[ $TEST_GROUP == 'without-acceptance' ]]; then ./setup_test -b; fi

- vendor/bin/console twig:cache:warmer

script:
- if [[ $TEST_GROUP == 'acceptance' ]]; then ./setup_test -f; fi
- if [[ $TEST_GROUP == 'without-acceptance' ]]; then ./setup_test -b; fi

- if [[ $TEST_GROUP == 'without-acceptance' ]]; then vendor/bin/codecept run -x Acceptance ; fi
- if [[ $TEST_GROUP == 'acceptance' ]]; then vendor/bin/codecept run -g Acceptance ; fi
- vendor/bin/phantomjs --webdriver=4444 > /dev/null &
- if [[ $TEST_GROUP == 'without-acceptance' ]]; then vendor/bin/codecept run -x Acceptance -x Presentation -vvv ; fi
- if [[ $TEST_GROUP == 'acceptance' ]]; then vendor/bin/codecept run -g Acceptance -g Presentation ; fi

- if [[ $TRAVIS_PHP_VERSION == 7.0 ]] ; then vendor/bin/console code:sniff ; fi

Expand Down
10 changes: 1 addition & 9 deletions codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ settings:
memory_limit: 1024M
log: true

modules:
config:
Db:
dsn: ''
user: ''
password: ''
dump: tests/_data/dump.sql

coverage:
enabled: true
remote: true
Expand All @@ -33,4 +25,4 @@ extensions:
- Codeception\Extension\Phantoman
config:
Codeception\Extension\Phantoman:
suites: ['Acceptance']
suites: ['Acceptance', 'Presentation']
11 changes: 7 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,17 +163,20 @@
"spryker/architecture-sniffer": "^0.3.0",
"spryker/code-generator": "^0.2.0",
"spryker/code-sniffer": "*",
"stecman/symfony-console-completion": "^0.7.0"
"stecman/symfony-console-completion": "^0.7.0",
"fzaninotto/faker": "^1.6"
},
"autoload": {
"psr-0": {
"": "src",
"Unit": "tests",
"YvesUnit": "tests",
"Functional": "tests",
"Acceptance": "tests",
"Unit\\Spryker\\Shared\\Twig\\": "vendor/spryker/spryker/Bundles/Twig/tests"
}
"Acceptance": "tests"
},
"files": [
"vendor/spryker/spryker/autoload.php"
]
},
"autoload-dev": {
"psr-4": {
Expand Down
8 changes: 8 additions & 0 deletions setup_test
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ function backupTestingEnvData {
$CONSOLE setup:install $VERBOSITY
writeErrorMessage "Setup install failed"

labelText "Generate DataBuilders"
$CONSOLE transfer:databuilder:generate $VERBOSITY
writeErrorMessage "Generate DataBuilders failed"

labelText "Running propel code generation/migrations"
$CONSOLE propel:diff $VERBOSITY
$CONSOLE propel:migrate $VERBOSITY

labelText "Importing Demo data"
$CONSOLE import:demo-data $VERBOSITY
writeErrorMessage "DemoData import failed"
Expand Down
3 changes: 3 additions & 0 deletions src/Pyz/Zed/Console/ConsoleDependencyProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
use Spryker\Zed\StateMachine\Communication\Console\CheckTimeoutConsole as StateMachineCheckTimeoutConsole;
use Spryker\Zed\StateMachine\Communication\Console\ClearLocksConsole as StateMachineClearLocksConsole;
use Spryker\Zed\Touch\Communication\Console\TouchCleanUpConsole;
use Spryker\Zed\Transfer\Communication\Console\DataBuilderGeneratorConsole;
use Spryker\Zed\Transfer\Communication\Console\GeneratorConsole;
use Spryker\Zed\Transfer\Communication\Console\ValidatorConsole;
use Spryker\Zed\Twig\Communication\Console\CacheWarmerConsole;
Expand Down Expand Up @@ -123,7 +124,9 @@ public function getConsoleCommands(Container $container)
$commands[] = new GenerateYvesIdeAutoCompletionConsole();
$commands[] = new GenerateIdeAutoCompletionConsole();
$commands[] = new CacheWarmerConsole();
$commands[] = new DataBuilderGeneratorConsole();
$commands[] = new CompletionCommand();
$commands[] = new DataBuilderGeneratorConsole();
}

return $commands;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@
* For full license information, please view the LICENSE file that was distributed with this source code.
*/

namespace Acceptance\Discount\Zed\PageObject;
namespace Pyz\Zed\Transfer;

class DiscountListPage
{

const URL = '/discount/index/list';

const SELECTOR_DATA_TABLE = '.dataTables_wrapper';
use Spryker\Zed\Transfer\TransferConfig as SprykerTransferConfig;

class TransferConfig extends SprykerTransferConfig
{
}
8 changes: 8 additions & 0 deletions tests/Acceptance.suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,16 @@ modules:
url: ''
browser: chrome
window_size: 1920x1080

- \SprykerTest\Shared\Testify\Helper\Environment
- \SprykerTest\Shared\Propel\Helper\ConnectionHelper
- \Application\Module\Yves
- \Application\Module\Zed
- \SprykerTest\Shared\Testify\Helper\LocatorHelper
- \SprykerTest\Shared\Testify\Helper\DependencyHelper
- \Module\Customer
- Cli
- Asserts

coverage:
enabled: false
9 changes: 9 additions & 0 deletions tests/Acceptance/Customer/Yves/CustomerNewsletterCest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

use Acceptance\Customer\Yves\PageObject\CustomerNewsletterPage;
use Acceptance\Customer\Yves\Tester\CustomerLoginTester;
use Codeception\Util\Stub;
use Spryker\Zed\Newsletter\Dependency\Facade\NewsletterToMailInterface;
use Spryker\Zed\Newsletter\NewsletterDependencyProvider;

/**
* @group Acceptance
Expand All @@ -28,6 +31,9 @@ public function testICanSubscribeNewsletter(CustomerLoginTester $i)
{
$i->amLoggedInCustomer();
$i->amOnPage(CustomerNewsletterPage::URL);

$i->setDependency(NewsletterDependencyProvider::FACADE_MAIL, Stub::makeEmpty(NewsletterToMailInterface::class));

$i->click(['name' => CustomerNewsletterPage::FORM_FIELD_SELECTOR_NEWSLETTER_SUBSCRIPTION]);
$i->click(CustomerNewsletterPage::BUTTON_SUBMIT);
$i->waitForText(CustomerNewsletterPage::SUCCESS_MESSAGE_SUBSCRIBED);
Expand All @@ -41,6 +47,9 @@ public function testICanSubscribeNewsletter(CustomerLoginTester $i)
public function testICanUnSubscribeNewsletter(CustomerLoginTester $i)
{
$i->amLoggedInCustomer();

$i->setDependency(NewsletterDependencyProvider::FACADE_MAIL, Stub::makeEmpty(NewsletterToMailInterface::class));

$i->addNewsletterSubscription(CustomerNewsletterPage::NEW_CUSTOMER_EMAIL);
$i->amOnPage(CustomerNewsletterPage::URL);
$i->click(['name' => CustomerNewsletterPage::FORM_FIELD_SELECTOR_NEWSLETTER_SUBSCRIPTION]);
Expand Down
64 changes: 0 additions & 64 deletions tests/Acceptance/Discount/Zed/DiscountCreateCest.php

This file was deleted.

38 changes: 0 additions & 38 deletions tests/Acceptance/Discount/Zed/DiscountListCest.php

This file was deleted.

45 changes: 0 additions & 45 deletions tests/Acceptance/Discount/Zed/PageObject/DiscountCreatePage.php

This file was deleted.

61 changes: 0 additions & 61 deletions tests/Acceptance/Discount/Zed/Tester/DiscountTester.php

This file was deleted.

6 changes: 6 additions & 0 deletions tests/Console.suite.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class_name: ConsoleTester
modules:
enabled:
- Cli
- Filesystem
- \Helper\Console
Loading

0 comments on commit 2f78ed3

Please sign in to comment.