mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Merge branch '4' into 5.0
# Conflicts: # client/dist/js/TinyMCE_sslink-anchor.js # client/dist/js/TinyMCE_sslink-internal.js # composer.json # tests/behat/features/insert-a-link.feature # tests/behat/features/insert-anchor-link.feature
This commit is contained in:
commit
6259ca30ad
@ -8,7 +8,8 @@ So that I can link to a external website or a page on my site
|
|||||||
Given a "page" "Home"
|
Given a "page" "Home"
|
||||||
And a "page" "About Us" has the "Content" "<p>My awesome content</p>"
|
And a "page" "About Us" has the "Content" "<p>My awesome content</p>"
|
||||||
And a "file" "file1.jpg"
|
And a "file" "file1.jpg"
|
||||||
And the "group" "EDITOR" has permissions "Access to 'Pages' section"
|
# And the "group" "EDITOR" has permissions "Access to 'Pages' section"
|
||||||
|
And the "group" "EDITOR" has permissions "Access to 'Files' section" and "Access to 'Pages' section" and "FILE_EDIT_ALL"
|
||||||
And I am logged in as a member of "EDITOR" group
|
And I am logged in as a member of "EDITOR" group
|
||||||
And I go to "/admin/pages"
|
And I go to "/admin/pages"
|
||||||
And I click on "About Us" in the tree
|
And I click on "About Us" in the tree
|
||||||
@ -79,7 +80,7 @@ So that I can link to a external website or a page on my site
|
|||||||
# Required to avoid "unsaved changed" browser dialog
|
# Required to avoid "unsaved changed" browser dialog
|
||||||
And I press the "Save" button
|
And I press the "Save" button
|
||||||
|
|
||||||
Scenario: I can edit a link
|
Scenario: I can edit an external link
|
||||||
Given I fill in the "Content" HTML field with "<p>My <a href='http://silverstripe.org'>awesome</a> content"
|
Given I fill in the "Content" HTML field with "<p>My <a href='http://silverstripe.org'>awesome</a> content"
|
||||||
And I select "awesome" in the "Content" HTML field
|
And I select "awesome" in the "Content" HTML field
|
||||||
When I press the "Insert link" HTML field button
|
When I press the "Insert link" HTML field button
|
||||||
@ -93,7 +94,7 @@ So that I can link to a external website or a page on my site
|
|||||||
# Required to avoid "unsaved changes" browser dialog
|
# Required to avoid "unsaved changes" browser dialog
|
||||||
Then I press the "Save" button
|
Then I press the "Save" button
|
||||||
|
|
||||||
Scenario: I can remove a link
|
Scenario: I can remove an external link
|
||||||
Given I fill in the "Content" HTML field with "My <a href='http://silverstripe.org'>awesome</a> content"
|
Given I fill in the "Content" HTML field with "My <a href='http://silverstripe.org'>awesome</a> content"
|
||||||
And I select "awesome" in the "Content" HTML field
|
And I select "awesome" in the "Content" HTML field
|
||||||
When I press the "Remove link" button
|
When I press the "Remove link" button
|
||||||
|
Loading…
Reference in New Issue
Block a user