tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1'

This commit is contained in:
Ingo Schommer 2014-03-13 13:36:24 +13:00
parent cc95083f1f 20605f7be0
commit 702f6a2091
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/behat/features/insert-an-image.feature
View File

@ -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

4
tests/behat/features/manage-files.feature
View File

@ -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"