From c3693b0b7cd1a0c295ffa18b7380ccf02bf2dc20 Mon Sep 17 00:00:00 2001 From: Miguel Date: Mon, 7 Sep 2015 16:51:04 +0100 Subject: [PATCH 01/10] add platformUI profile ans suite to behat.yml --- behat.yml.dist | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/behat.yml.dist b/behat.yml.dist index 8b521d4ce6..633c45d29e 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -21,6 +21,19 @@ default: # default profile: no suites suites: ~ +platformui: + suites: + standard: + paths: [ vendor/ezsystems/platform-ui-bundle/Features/Standard ] + contexts: + - EzSystems\PlatformUIBundle\Features\Context\PlatformUI: + uri: /ez + CopyMoveDelete: + paths: [ vendor/ezsystems/platform-ui-bundle/Features/CopyMoveDelete ] + contexts: + - EzSystems\PlatformUIBundle\Features\Context\PlatformUI: + uri: /ez + rest: suites: fullJson: From b0bf33400c884e5d10b7674d302d63dc3fd8b091 Mon Sep 17 00:00:00 2001 From: Bertrand Dunogier Date: Tue, 8 Sep 2015 13:48:13 +0200 Subject: [PATCH 02/10] Added EzPlatformBehatBundle to Kernel (behat) Story: EZP-24774 --- ezpublish/EzPublishKernel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/ezpublish/EzPublishKernel.php b/ezpublish/EzPublishKernel.php index f98c628585..9a8f7638e3 100644 --- a/ezpublish/EzPublishKernel.php +++ b/ezpublish/EzPublishKernel.php @@ -56,6 +56,7 @@ public function registerBundles() case 'test': case 'behat': $bundles[] = new EzSystems\BehatBundle\EzSystemsBehatBundle(); + $bundles[] = new EzSystems\PlatformBehatBundle\EzPlatformBehatBundle(); // No break, test also needs dev bundles case 'dev': $bundles[] = new eZ\Bundle\EzPublishDebugBundle\EzPublishDebugBundle(); From e1232ff4fe56fc1a73cb1ef94b2dec10d235d785 Mon Sep 17 00:00:00 2001 From: Bertrand Dunogier Date: Sun, 6 Sep 2015 16:29:53 +0200 Subject: [PATCH 03/10] BDD: Added behat config for core profile Story: EZP-24774 --- behat.yml.dist | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/behat.yml.dist b/behat.yml.dist index 633c45d29e..4e3941576c 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -34,6 +34,12 @@ platformui: - EzSystems\PlatformUIBundle\Features\Context\PlatformUI: uri: /ez +core: + suites: + console: + paths: [ vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishCoreBundle/Features/Console] + contexts: [ eZ\Bundle\EzPublishCoreBundle\Features\Context\ConsoleContext ] + rest: suites: fullJson: From 6a476239db6a3eccb1ce9c14c44de250384d446c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Vieilledent?= Date: Thu, 10 Sep 2015 14:09:07 +0200 Subject: [PATCH 04/10] Fixed CS on ezpublish/console --- ezpublish/console | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ezpublish/console b/ezpublish/console index 6d522a9d8a..40bd588276 100755 --- a/ezpublish/console +++ b/ezpublish/console @@ -5,23 +5,22 @@ // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information //umask( 0000 ); -set_time_limit( 0 ); +set_time_limit(0); // Use autoload over boostrap here so we don't need to keep the generated files in git -require_once __DIR__.'/autoload.php'; -require_once __DIR__.'/EzPublishKernel.php'; +require_once __DIR__ . '/autoload.php'; +require_once __DIR__ . '/EzPublishKernel.php'; use eZ\Bundle\EzPublishCoreBundle\Console\Application; use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Debug\Debug; $input = new ArgvInput(); -$env = $input->getParameterOption( array( '--env', '-e' ), getenv( 'SYMFONY_ENV' ) ?: 'dev' ); -$debug = getenv( 'SYMFONY_DEBUG' ) !== '0' && !$input->hasParameterOption( array( '--no-debug', '' ) ) && $env !== 'prod'; -if ( $debug ) -{ +$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); +$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; +if ($debug) { Debug::enable(); } -$application = new Application( new EzPublishKernel( $env, $debug ) ); -$application->run( $input ); +$application = new Application(new EzPublishKernel($env, $debug)); +$application->run($input); From db378736ffc25aa94b5ff9ca4de29c9a1b078233 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Fri, 11 Sep 2015 09:19:49 +0200 Subject: [PATCH 05/10] Added behat-junit-formatter dependency to composer.json --- composer.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/composer.json b/composer.json index b3ed9c7e0e..f320cb3e57 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,12 @@ "homepage": "https://github.com/ezsystems/ezplatform/contributors" } ], + "repositories": [ + { + "type": "vcs", + "url": "git@github.com:vidarl/behat-junit-formatter.git" + } + ], "replace": { "ezsystems/ezpublish-community": "*" }, @@ -47,6 +53,7 @@ "behat/mink-extension": "*", "behat/mink-goutte-driver": "*", "behat/mink-selenium2-driver": "*", + "jarnaiz/behat-junit-formatter": "dev-undefined_sentences", "ezsystems/behatbundle": "@dev" }, "suggest": { From b40837e60703932d5bcb7ba44eb43b9758ffb971 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Fri, 11 Sep 2015 09:44:33 +0200 Subject: [PATCH 06/10] Enabled behat-junit-formatter in behat.yml --- behat.yml.dist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/behat.yml.dist b/behat.yml.dist index 633c45d29e..bdf24d21e6 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -18,6 +18,10 @@ default: env: behat debug: false + jarnaiz\JUnitFormatter\JUnitFormatterExtension: + filename: report.xml + outputDir: %paths.base%/build/tests + # default profile: no suites suites: ~ From 4d77aa77925e571f9d5184dc30ab855dc7a17997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20R=2E?= Date: Tue, 15 Sep 2015 23:42:17 +0200 Subject: [PATCH 07/10] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f320cb3e57..7bace765dd 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "repositories": [ { "type": "vcs", - "url": "git@github.com:vidarl/behat-junit-formatter.git" + "url": "https://github.com/vidarl/behat-junit-formatter.git" } ], "replace": { From ae8448e07a07188fb19bb8369598062e8127b00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Wed, 16 Sep 2015 00:39:38 +0200 Subject: [PATCH 08/10] Revert "Enabled behat-junit-formatter in behat.yml" This reverts commit b40837e60703932d5bcb7ba44eb43b9758ffb971. --- behat.yml.dist | 4 ---- 1 file changed, 4 deletions(-) diff --git a/behat.yml.dist b/behat.yml.dist index f197d4ca43..4e3941576c 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -18,10 +18,6 @@ default: env: behat debug: false - jarnaiz\JUnitFormatter\JUnitFormatterExtension: - filename: report.xml - outputDir: %paths.base%/build/tests - # default profile: no suites suites: ~ From 69a5469538ef0951dffe7cfdce38a1ca71d22f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Wed, 16 Sep 2015 00:40:50 +0200 Subject: [PATCH 09/10] Revert "Added behat-junit-formatter dependency to composer.json" This reverts commit db378736ffc25aa94b5ff9ca4de29c9a1b078233. --- composer.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/composer.json b/composer.json index 7bace765dd..b3ed9c7e0e 100644 --- a/composer.json +++ b/composer.json @@ -9,12 +9,6 @@ "homepage": "https://github.com/ezsystems/ezplatform/contributors" } ], - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/vidarl/behat-junit-formatter.git" - } - ], "replace": { "ezsystems/ezpublish-community": "*" }, @@ -53,7 +47,6 @@ "behat/mink-extension": "*", "behat/mink-goutte-driver": "*", "behat/mink-selenium2-driver": "*", - "jarnaiz/behat-junit-formatter": "dev-undefined_sentences", "ezsystems/behatbundle": "@dev" }, "suggest": { From b117c018df6a89cae3d31be0ec5590ead4261882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20R=2E?= Date: Wed, 16 Sep 2015 14:42:51 +0200 Subject: [PATCH 10/10] [Composer] Bump dependencies to ~1.0.0@dev --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index b3ed9c7e0e..2237ad7b34 100644 --- a/composer.json +++ b/composer.json @@ -27,10 +27,10 @@ "incenteev/composer-parameter-handler": "~2.0", "tedivm/stash-bundle": "0.4.*", "ezsystems/ezpublish-kernel": "~6.0@dev", - "ezsystems/repository-forms": "~0.1@dev", + "ezsystems/repository-forms": "~1.0.0@dev", "ezsystems/ezplatform-solr-search-engine": "~1.0.0@dev", - "ezsystems/platform-ui-bundle": "~0.8@dev", - "ezsystems/platform-ui-assets-bundle": "~0.2", + "ezsystems/platform-ui-bundle": "~1.0.0@dev", + "ezsystems/platform-ui-assets-bundle": "~1.0.0@dev", "ezsystems/demobundle": "~6.0@dev", "ezsystems/comments-bundle": "~6.0@dev", "ezsystems/privacy-cookie-bundle": "~0.1",