Merge remote-tracking branch 'origin/3.1'

This commit is contained in:
Ingo Schommer 2014-03-13 13:40:32 +13:00
commit f6d929f05d

View File

@ -6,8 +6,8 @@ Feature: Insert an image into a page
Background:
Given a "page" "About Us"
And a "file" "assets/folder1/file1.jpg"
And a "file" "assets/folder1/file2.jpg"
And a "image" "assets/folder1/file1.jpg"
And a "image" "assets/folder1/file2.jpg"
And I am logged in with "ADMIN" permissions
And I go to "/admin/pages"
And I click on "About Us" in the tree