Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] SyliusResourceBundle Reloaded #2255

Closed
wants to merge 8 commits into from
Closed

[WIP] SyliusResourceBundle Reloaded #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e673433
Resource bundle refactoring
Jan 19, 2015
e74972e
Fix Translation extension
michalmarcinkowski Aug 21, 2015
5868167
Fix API responses and templates resolving
michalmarcinkowski Aug 25, 2015
f8a6b96
Add check if interface is present in the resource configuration
michalmarcinkowski Aug 25, 2015
18c890a
Implement default form factory
michalmarcinkowski Aug 25, 2015
b20e73b
Fix delete action response status code
michalmarcinkowski Aug 26, 2015
d9ef077
Fix scenarios
pjedrzejewski Sep 4, 2015
f680622
Fix specs
pjedrzejewski Sep 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions behat.yml.dist
View file
Open in desktop
Expand Up @@ -385,6 +385,7 @@ default:
- Behat\MinkExtension\Context\MinkContext
- Sylius\Bundle\CoreBundle\Behat\HookContext
- Sylius\Bundle\AddressingBundle\Behat\AddressingContext
- Sylius\Bundle\ChannelBundle\Behat\ChannelContext
- Sylius\Bundle\CoreBundle\Behat\CoreContext
- Sylius\Bundle\ProductBundle\Behat\ProductContext
- Sylius\Bundle\PromotionBundle\Behat\PromotionContext
Expand Down
120 changes: 120 additions & 0 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions features/backend/countries.feature
View file
Open in desktop
Expand Up @@ -108,11 +108,11 @@ Feature: Countries and provinces
And I am on the country index page
When I click "Enable" near "Poland"
Then I should see enabled country with name "Poland" in the list
And I should see "Country has been successfully enabled"
And I should see "Country has been successfully updated"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old scenario was better. :)


Scenario: Disabling country
Given there is an enabled country "Poland"
And I am on the country index page
When I click "Disable" near "Poland"
Then I should see disabled country with name "Poland" in the list
And I should see "Country has been successfully disabled"
And I should see "Country has been successfully updated"
4 changes: 2 additions & 2 deletions features/backend/locales.feature
View file
Open in desktop
Expand Up @@ -47,11 +47,11 @@ Feature: Managing locales
And I am on the locale index page
When I click "Enable" near "Polish (Poland)"
Then I should see enabled locale with name "Polish (Poland)" in the list
And I should see "Locale has been successfully enabled"
And I should see "Locale has been successfully updated"

Scenario: Disabling locale
Given there is an enabled locale "Polish (Poland)"
And I am on the locale index page
When I click "Disable" near "Polish (Poland)"
Then I should see disabled locale with name "Polish (Poland)" in the list
And I should see "Locale has been successfully disabled"
And I should see "Locale has been successfully updated"
28 changes: 27 additions & 1 deletion features/security/permission_management.feature
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@ Feature: Permissions management
I want to be able to manage permissions

Background:
<<<<<<< HEAD
Given store has default configuration
And there is following permission hierarchy:
| code | parent | description |
Expand All @@ -23,6 +24,30 @@ Feature: Permissions management
| code | parent | name | security roles |
| sylius.administrator | | Administrator | ROLE_ADMINISTRATION_ACCESS |
And role "Administrator" has the following permissions:
=======
Given there is default currency configured
And there is default channel configured
And there are following locales configured:
| code | enabled |
| en_US | yes |
And there is following permission hierarchy:
| code | parent | description |
| sylius.catalog | | Manage products catalog |
| sylius.product.show | sylius.catalog | View single product |
| sylius.product.index | sylius.catalog | List all products |
| sylius.product.create | sylius.catalog | Add new products |
| sylius.product.update | sylius.catalog | Edit products |
| sylius.product.delete | sylius.catalog | Delete products |
| sylius.permission.show | | View single permission |
| sylius.permission.index | | List all permissions |
| sylius.permission.create | | Add new permissions |
| sylius.permission.update | | Edit permissions |
| sylius.permission.delete | | Delete permissions |
And there is following role hierarchy:
| code | parent | name | security roles |
| sylius.administrator | | Administrator | ROLE_ADMINISTRATION_ACCESS |
And role "Administrator" has the following permissions:
>>>>>>> Fix specs
| sylius.permission.show |
| sylius.permission.index |
| sylius.permission.create |
Expand Down Expand Up @@ -58,7 +83,8 @@ Feature: Permissions management
Then I should be on the permission index page
And I should see "Permission has been successfully created."
And I should see 13 permissions in the list
And I should see permission with code "sylius.product.display_sales_stats" in that list
And show last response
And I should see "View sales statistics (sylius.product.display_sales_stats)"

Scenario: Cannot edit the parent of root node
Given I am on the permission index page
Expand Down