mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Merge remote-tracking branch 'origin/3.1'
This commit is contained in:
commit
702f6a2091
@ -41,7 +41,7 @@ Feature: Insert an image into a page
|
||||
|
||||
@assets
|
||||
Scenario: I can overwrite an existing image with one uploaded from my own computer
|
||||
Given a "file" "assets/Uploads/file1.jpg"
|
||||
Given a "image" "assets/Uploads/file1.jpg"
|
||||
When I press the "Insert Media" button
|
||||
And I press the "From your computer" button
|
||||
And I attach the file "file1.jpg" to "AssetUploadField" with HTML5
|
||||
|
@ -5,8 +5,8 @@ Feature: Manage files
|
||||
So that I can insert them into my content efficiently
|
||||
|
||||
Background:
|
||||
Given a "file" "assets/folder1/file1.jpg"
|
||||
And a "file" "assets/folder1/folder1.1/file2.jpg"
|
||||
Given a "image" "assets/folder1/file1.jpg"
|
||||
And a "image" "assets/folder1/folder1.1/file2.jpg"
|
||||
And a "folder" "assets/folder2"
|
||||
And I am logged in with "ADMIN" permissions
|
||||
And I go to "/admin/assets"
|
||||
|
Loading…
Reference in New Issue
Block a user