Skip to content

Commit

Permalink
Merge remote-tracking branch 'ibexa-adminui/main' into merge-ibx-1193…
Browse files Browse the repository at this point in the history 
…-added-log-out-step-in-behat
  • Loading branch information
@tomaszszopinski
tomaszszopinski committed Dec 7, 2021
2 parents b2f12f9 + fe09466 commit b372959
Show file tree
Hide file tree
Showing 1,738 changed files with 33,723 additions and 23,258 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/browser-tests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Browser tests
on:
push:
branches:
- master
- main
- '[0-9]+.[0-9]+'
pull_request: ~

Expand All @@ -13,9 +13,8 @@ jobs:
uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
with:
project-edition: 'oss'
project-version: '^3.3.x-dev'
project-version: '^4.0.x-dev'
test-suite: '--profile=browser --suite=admin-ui-full'
test-setup-phase-1: '--profile=setup --suite=personas --mode=standard'
composer-package-version: '2.3.x-dev'
secrets:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
6 changes: 1 addition & 5 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ name: CI
on:
push:
branches:
- master
- main
- '[0-9]+.[0-9]+'
pull_request: ~

env:
COMPOSER_ROOT_VERSION: 2.3.x-dev

jobs:
tests:
name: Tests
Expand All @@ -20,7 +17,6 @@ jobs:
fail-fast: false
matrix:
php:
- '7.3'
- '7.4'

steps:
Expand Down
7 changes: 6 additions & 1 deletion .php-cs-fixer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
->buildConfig()
->setFinder(
PhpCsFixer\Finder::create()
->in(__DIR__ . '/src')
->in(
array_filter([
__DIR__ . '/src',
__DIR__ . '/tests',
], 'is_dir')
)
->files()->name('*.php')
);
16 changes: 7 additions & 9 deletions behat_suites.yml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
browser:
extensions:
Behat\MinkExtension:
files_path: '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/src/lib/Behat/TestFiles/'
files_path: '%paths.base%/vendor/ibexa/admin-ui/src/lib/Behat/TestFiles/'
suites:
admin-ui:
paths:
- '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/standard'
- '%paths.base%/vendor/ibexa/admin-ui/features/standard'
filters:
tags: "~@broken"
contexts:
Expand All @@ -16,7 +16,7 @@ browser:
- Ibexa\Behat\Browser\Context\DebuggingContext
- Ibexa\Behat\Browser\Context\AuthenticationContext
- Ibexa\AdminUi\Behat\BrowserContext\NavigationContext
- Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\UDWContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext
- Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext
Expand All @@ -36,42 +36,40 @@ browser:

personas:
paths:
- '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/personas'
- '%paths.base%/vendor/ibexa/admin-ui/features/personas'
contexts:
- Ibexa\Behat\Browser\Context\DebuggingContext
- Ibexa\Behat\Browser\Context\AuthenticationContext
- Ibexa\AdminUi\Behat\BrowserContext\NavigationContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentUpdateContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext
- Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\LeftMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\NotificationContext
- Ibexa\AdminUi\Behat\BrowserContext\TrashContext
- Ibexa\AdminUi\Behat\BrowserContext\UDWContext
- Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext

admin-ui-full:
paths:
- '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/'
- '%paths.base%/vendor/ibexa/admin-ui/features/'
contexts:
- EzSystems\Behat\API\Context\ContentContext
- EzSystems\Behat\API\Context\ContentTypeContext
- EzSystems\Behat\API\Context\RoleContext
- EzSystems\Behat\API\Context\TestContext
- EzSystems\Behat\API\Context\TrashContext
- Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentTypeContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentUpdateContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext
- Ibexa\AdminUi\Behat\BrowserContext\DashboardContext
- Ibexa\AdminUi\Behat\BrowserContext\LanguageContext
- Ibexa\AdminUi\Behat\BrowserContext\LeftMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\NavigationContext
- Ibexa\AdminUi\Behat\BrowserContext\NotificationContext
- Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext
- Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\RolesContext
- Ibexa\AdminUi\Behat\BrowserContext\SearchContext
- Ibexa\AdminUi\Behat\BrowserContext\SectionsContext
Expand Down
56 changes: 35 additions & 21 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,33 @@
{
"name": "ezsystems/ezplatform-admin-ui",
"name": "ibexa/admin-ui",
"license": "GPL-2.0-only",
"type": "project",
"description": "eZ Platform Admin v2",
"description": "Ibexa Admin Ui",
"replace": {
"ezsystems/ezplatform-admin-ui": "*"
},
"autoload": {
"psr-4": {
"EzSystems\\EzPlatformAdminUiBundle\\": "src/bundle/",
"EzSystems\\EzPlatformAdminUi\\": "src/lib/",
"Ibexa\\AdminUi\\": "src/lib/"
"Ibexa\\AdminUi\\": "src/lib/",
"Ibexa\\Bundle\\AdminUi\\": "src/bundle/",
"Ibexa\\Contracts\\AdminUi\\": "src/contracts/",
"EzSystems\\EzPlatformAdminUiBundle\\": "src/bundle/",
"EzSystems\\EzPlatformAdminUi\\": "src/lib/",
"EzSystems\\EzPlatformEncoreBundle\\": "src/bundle/",
"Ibexa\\Platform\\Bundle\\Assets\\": "src/bundle/",
"Ibexa\\Platform\\Assets\\": "src/lib/"
}
},
"autoload-dev": {
"psr-4": { "EzSystems\\EzPlatformAdminUi\\Tests\\": "src/lib/Tests" }
"psr-4": {
"Ibexa\\Tests\\Bundle\\AdminUi\\": "tests/bundle/",
"Ibexa\\Tests\\AdminUi\\": "tests/lib/",
"EzSystems\\EzPlatformAdminUi\\Tests\\": "tests/lib/",
"Ibexa\\Platform\\Tests\\Assets\\": "tests/lib/"
}
},
"require": {
"php": "^7.3",
"php": "^7.4",
"ext-json": "*",
"symfony/http-foundation": "^5.0",
"symfony/security-core": "^5.0",
Expand All @@ -33,13 +46,13 @@
"symfony/asset": "^5.0",
"symfony/yaml": "^5.0",
"jms/translation-bundle": "^1.5",
"ezsystems/ezplatform-kernel": "^1.3.10@dev",
"ezsystems/ezplatform-content-forms": "^1.3@dev",
"ezsystems/ezplatform-design-engine": "^3.0@dev",
"ezsystems/ezplatform-user": "^2.0@dev",
"ezsystems/ezplatform-richtext": "^2.0@dev",
"ezsystems/ezplatform-rest": "^1.0@dev",
"ezsystems/ezplatform-search": "^1.0@dev",
"ibexa/core": "^4.0@dev",
"ibexa/content-forms": "^4.0@dev",
"ibexa/design-engine": "^4.0@dev",
"ibexa/user": "^4.0@dev",
"ibexa/fieldtype-richtext": "^4.0@dev",
"ibexa/rest": "^4.0@dev",
"ibexa/search": "^4.0@dev",
"babdev/pagerfanta-bundle": "^2.1",
"knplabs/knp-menu-bundle": "^3.0",
"mck89/peast": "^1.9",
Expand All @@ -49,22 +62,23 @@
"twig/string-extra": "^3.0"
},
"require-dev": {
"ibexa/ci-scripts": "^0.1@dev",
"ezsystems/behatbundle": "^8.3@dev",
"friendsofphp/php-cs-fixer": "^2.16.0",
"ibexa/ci-scripts": "^0.2@dev",
"ezsystems/behatbundle": "^9.0@dev",
"friendsofphp/php-cs-fixer": "^3.0",
"phpunit/phpunit": "^8.1",
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
"ezsystems/doctrine-dbal-schema": "^1.0@dev",
"ezsystems/ezplatform-code-style": "^1.0"
"ibexa/doctrine-schema": "^4.0@dev",
"ibexa/http-cache": "^4.0@dev",
"ibexa/code-style": "^1.0"
},
"scripts": {
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php --show-progress=dots",
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
"check-cs": "@fix-cs --dry-run",
"test": "phpunit -c phpunit.xml"
},
"extra": {
"branch-alias": {
"dev-master": "2.3.x-dev"
"dev-main": "4.0.x-dev"
}
}
}
28 changes: 15 additions & 13 deletions features/personas/SubtreeEditor.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task
| FolderChild1 | root/FolderGrandParent/FolderParent | NewContent2 | root/FolderGrandParent/FolderParent/FolderChild1 |

Scenario Outline: I can edit Content in locations I'm allowed
Given I open UDW and go to "<contentPath>"
Given I navigate to content "<contentName>" of type "DedicatedFolder" in "<contentPath>"
When I click on the edit action bar button "Edit"
And I set content fields
| label | value |
Expand All @@ -38,9 +38,9 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task
| Name | <newFieldValue> |

Examples:
| contentPath | newFieldValue | parentContentPath |
| root/FolderGrandParent/FolderParent/FolderChild1/NewContent2 | NewContent2Edited | root/FolderGrandParent/FolderParent/FolderChild1 |
| root/FolderGrandParent/FolderParent/NewContent1 | NewContent1Edited | root/FolderGrandParent/FolderParent |
| contentPath | contentName | newFieldValue | parentContentPath |
| root/FolderGrandParent/FolderParent/FolderChild1 | NewContent2 | NewContent2Edited | root/FolderGrandParent/FolderParent/FolderChild1 |
| root/FolderGrandParent/FolderParent | NewContent1 | NewContent1Edited | root/FolderGrandParent/FolderParent |

Scenario: I can move Content to Trash in locations I'm allowed
Given I navigate to content "NewContent1Edited" of type "DedicatedFolder" in "root/FolderGrandParent/FolderParent"
Expand All @@ -56,15 +56,17 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task
Then success notification that "'ContentToMove' moved to 'FolderParent'" appears
And I should be on Content view Page for "root/FolderGrandParent/FolderParent/ContentToMove"

Scenario Outline: I cannot edit, create or send to trash Content outside my permissions
When I open UDW and go to "<contentPath>"
Scenario: I cannot edit, create or send to trash Content in root location
Then the buttons are disabled
| buttonName |
| Create |
| Edit |
| buttonName |
| Create content |
| Edit |
And the "Send to Trash" button is not visible

Examples:
| contentPath |
| root |
| root/FolderGrandParent |
Scenario: I cannot edit, create or send to trash Content outside my permissions
Given I navigate to content "FolderGrandParent" of type "DedicatedFolder" in "root"
Then the buttons are disabled
| buttonName |
| Create content |
| Edit |
And the "Send to Trash" button is not visible
7 changes: 4 additions & 3 deletions features/standard/ContentType.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ Feature: Content types management
| Name | Test Content Type |
| Identifier | TestContentTypeIdentifier |
| Content name pattern | <name> |
And I select "Content" category to Content Type definition
And I add field "Country" to Content Type definition
And I set "Name" to "Country field" for "Country" field
And I click on the edit action bar button "Save"
Then notification that "Content Type" "Test Content Type" is updated appears
And I click on the edit action bar button "Create"
Then notification that "Content Type" "New Content Type" is updated appears
Then I should be on Content Type page for "Test Content Type"
And Content Type has proper Global properties
| label | value |
Expand Down Expand Up @@ -71,7 +72,7 @@ Feature: Content types management
And I add field "Date" to Content Type definition
And I set "Name" to "DateField" for "Date" field
And I click on the edit action bar button "Save"
Then success notification that "Content Type 'Test Content Type edited' updated." appears
Then success notification that "Content Type 'TestEdit CT' updated." appears
Then I should be on Content Type page for "Test Content Type edited"
And Content Type has proper Global properties
| label | value |
Expand Down
2 changes: 1 addition & 1 deletion features/standard/ContentTypeFields.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Feature: Content fields setting and editing
| value | false | | | | | 1 | 0 |
| value | Media/Files | | | | | Images | Files |
| firstItem | Users/Editors | secondItem | Media/Multimedia | | | Images Files | Editors Multimedia |
| value | Argentina | | | | | Angola | Argentina |
| value | Albania | | | | | Angola | Albania |
| value | 12/30/2019 | | | | | Saturday 23 November 2019 | Monday 30 December 2019 |
| date | 12/30/2019 | time | 15:15 | | | Sat 2019-23-11 14:45:00 | Mon 2019-30-12 15:15:00 |
| value | edited.email@example.com | | | | | email@example.com | edited.email@example.com |
Expand Down
29 changes: 7 additions & 22 deletions features/standard/SystemInfo.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,9 @@ Feature: System info verification
When I go to "Composer" tab in System Information
Then I see "Composer" system information table
And I see listed packages
| Name |
| ezsystems/ez-support-tools |
| ezsystems/ezplatform-admin-ui |
| ezsystems/ezplatform-admin-ui-assets |
| ezsystems/ezplatform-design-engine |
| ezsystems/ezplatform-http-cache |
| ezsystems/ezplatform-solr-search-engine |
| ezsystems/ezplatform-kernel |
| ezsystems/ezplatform-content-forms |
| Name |
| ibexa/admin-ui |
| ibexa/core |

@javascript
Scenario: Check Repository System Information
Expand All @@ -48,16 +42,7 @@ Feature: System info verification
When I go to "Symfony Kernel" tab in System Information
Then I see "Symfony Kernel" system information table
And I see listed bundles
| Name |
| EzPlatformAdminUiAssetsBundle |
| EzPlatformAdminUiBundle |
| EzPlatformDesignEngineBundle |
| EzPublishCoreBundle |
| EzPublishIOBundle |
| EzPublishLegacySearchEngineBundle |
| EzPlatformRestBundle |
| EzSystemsEzPlatformSolrSearchEngineBundle |
| EzSystemsEzSupportToolsBundle |
| EzSystemsPlatformHttpCacheBundle |
| EzSystemsPlatformInstallerBundle |
| EzPlatformContentFormsBundle |
| Name |
| IbexaAdminUiAssetsBundle |
| IbexaAdminUiBundle |
| IbexaCoreBundle |
12 changes: 4 additions & 8 deletions phpunit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,16 @@
convertWarningsToExceptions="true"
colors="true">
<testsuites>
<testsuite name="EzSystems\EzPlatformAdminUiBundle">
<directory>src/bundle/Tests/</directory>
<testsuite name="Ibexa\Bundle\AdminUi">
<directory>tests/bundle</directory>
</testsuite>
<testsuite name="EzSystems\EzPlatformAdminUi">
<directory>src/lib/Tests/</directory>
<testsuite name="Ibexa\AdminUi">
<directory>tests/lib</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>src</directory>
<exclude>
<directory>src/bundle/Tests/</directory>
<directory>src/lib/Tests/</directory>
</exclude>
</whitelist>
</filter>
</phpunit>
Loading

0 comments on commit b372959

Please sign in to comment.