my new content
" - And I press the "Save draft" button + And I press the "Save" button Then I should see the "Saved" button When I click on "About Us" in the tree diff --git a/tests/behat/features/insert-a-link.feature b/tests/behat/features/insert-a-link.feature index 69a2fd82..48508b37 100644 --- a/tests/behat/features/insert-a-link.feature +++ b/tests/behat/features/insert-a-link.feature @@ -24,7 +24,7 @@ So that I can link to a external website or a page on my site And I press the "Insert" button Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button Scenario: I can link to an anchor in an internal page When I select "awesome" in the "Content" HTML field @@ -41,7 +41,7 @@ So that I can link to a external website or a page on my site And I press the "Insert" button Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button Scenario: I can edit a link to an internal page Given I fill in the "Content" HTML field with "awesome" @@ -58,7 +58,7 @@ So that I can link to a external website or a page on my site And I press the "Insert" button Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button Scenario: I can link to an external URL Given I select "awesome" in the "Content" HTML field @@ -70,7 +70,7 @@ So that I can link to a external website or a page on my site And I press the "Insert" button Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button Scenario: I can edit a link Given I fill in the "Content" HTML field with "My awesome content" @@ -84,7 +84,7 @@ So that I can link to a external website or a page on my site And I press the "Insert" button Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button Scenario: I can remove a link Given I fill in the "Content" HTML field with "My awesome content" @@ -93,4 +93,4 @@ So that I can link to a external website or a page on my site Then the "Content" HTML field should contain "My awesome content" And the "Content" HTML field should not contain "http://silverstripe.org" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button diff --git a/tests/behat/features/manage-page-permissions.feature b/tests/behat/features/manage-page-permissions.feature index c27aa67f..2a50e8b4 100644 --- a/tests/behat/features/manage-page-permissions.feature +++ b/tests/behat/features/manage-page-permissions.feature @@ -23,7 +23,7 @@ Feature: Manage page permissions Scenario: I can limit page view permissions to logged-in users Given I select "Logged-in users" from "Who can view this page?" input group - And I press the "Save & publish" button + And I press the "Publish" button When I am not logged in And I go to the homepage Then I should see a log-in form @@ -34,7 +34,7 @@ Feature: Manage page permissions Scenario: I can limit page view permissions to certain groups Given I select "Only these groups (choose from list)" from "Who can view this page?" input group And I select "AUTHOR group" in the "#Form_EditForm_ViewerGroups_Holder" tree dropdown - And I press the "Save & publish" button + And I press the "Publish" button When I am not logged in And I go to the homepage Then I should see a log-in form @@ -48,14 +48,14 @@ Feature: Manage page permissions Scenario: I can limit page edit permissions to logged-in users Given I select "Logged-in users" from "Who can edit this page?" input group - And I press the "Save & publish" button + And I press the "Publish" button Then pages should be editable by "AUTHOR" And pages should be editable by "ADMIN" Scenario: I can limit page edit permissions to certain groups Given I select "Only these groups (choose from list)" from "Who can edit this page?" input group And I select "ADMIN group" in the "#Form_EditForm_EditorGroups_Holder" tree dropdown - And I press the "Save & publish" button + And I press the "Publish" button Then pages should not be editable by "AUTHOR" But pages should be editable by "ADMIN" diff --git a/tests/behat/features/preview-a-page.feature b/tests/behat/features/preview-a-page.feature index abe4a994..8769117b 100644 --- a/tests/behat/features/preview-a-page.feature +++ b/tests/behat/features/preview-a-page.feature @@ -31,7 +31,7 @@ Feature: Preview a page And I fill in the "Content" HTML field with "
first content
" And I press the "Publish" button And I fill in the "Content" HTML field with "my new content
" - And I press the "Save draft" button + And I press the "Save" button And I set the CMS mode to "Preview mode" When I switch the preview to "Published" diff --git a/tests/behat/features/publish-a-page.feature b/tests/behat/features/publish-a-page.feature index 516d6331..d4ec9d0b 100644 --- a/tests/behat/features/publish-a-page.feature +++ b/tests/behat/features/publish-a-page.feature @@ -18,7 +18,7 @@ Feature: Publish a page And I go to "/admin/pages" And I should see "My Page" in the tree And I click on "My Page" in the tree - And I press the "Save & publish" button + And I press the "Publish" button Then I am not logged in And I go to "/my-page" @@ -36,16 +36,16 @@ Feature: Publish a page Then I should see "Not published" in the "#ActionMenus_MoreOptions" element And I should not see an "Unpublish" button And I should see an "Archive" button - And I should see a "Save & publish" button + And I should see a "Publish" button And I should see a "Saved" button When I fill in the "Content" HTML field with "my new content
" And I click "More options" in the "#ActionMenus" element Then I should not see an "Unpublish" button - And I should see a "Save & publish" button - And I should see a "Save draft" button + And I should see a "Publish" button + And I should see a "Save" button - When I press the "Save & publish" button + When I press the "Publish" button And I click "More options" in the "#ActionMenus" element Then I should see an "Unpublish" button And I should see an "Unpublish and archive" button @@ -76,7 +76,7 @@ Feature: Publish a page And I go to "/admin/pages" And I should see "My Page" in the tree And I click on "My Page" in the tree - And I press the "Save & publish" button + And I press the "Publish" button And I click "More options" in the "#ActionMenus" element Then I should see an "Unpublish" button @@ -87,9 +87,9 @@ Feature: Publish a page When I press the "Archive" button, confirming the dialog Then I should see a "Restore" button And I should not see a "Published" button - And I should not see a "Save & publish" button + And I should not see a "Publish" button And I should not see a "Saved" button - And I should not see a "Save draft" button + And I should not see a "Save" button When I press the "Restore" button, confirming the dialog - Then I should see a "Save & publish" button + Then I should see a "Publish" button diff --git a/tests/behat/features/search-for-a-page.feature b/tests/behat/features/search-for-a-page.feature index 7fa6afdc..3a87fb70 100644 --- a/tests/behat/features/search-for-a-page.feature +++ b/tests/behat/features/search-for-a-page.feature @@ -80,7 +80,7 @@ Feature: Search for a page Then I should see an edit page form When I fill in the "Content" HTML field with "my new content
" - And I press the "Save draft" button + And I press the "Save" button Then I should see "Saved" in the "button#Form_EditForm_action_save" element When I go to "/admin/pages" diff --git a/tests/php/Model/FileLinkTrackingTest.php b/tests/php/Model/FileLinkTrackingTest.php index 13c79d6b..f0ba2f5c 100644 --- a/tests/php/Model/FileLinkTrackingTest.php +++ b/tests/php/Model/FileLinkTrackingTest.php @@ -10,7 +10,7 @@ use SilverStripe\CMS\Model\VirtualPage; use SilverStripe\Assets\File; use SilverStripe\Assets\Filesystem; use SilverStripe\Dev\SapphireTest; -use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore; +use Silverstripe\Assets\Dev\TestAssetStore; use Page; class FileLinkTrackingTest extends SapphireTest diff --git a/tests/php/Model/SiteTreeBrokenLinksTest.php b/tests/php/Model/SiteTreeBrokenLinksTest.php index 49026d7c..8ae9adfb 100644 --- a/tests/php/Model/SiteTreeBrokenLinksTest.php +++ b/tests/php/Model/SiteTreeBrokenLinksTest.php @@ -10,7 +10,7 @@ use SilverStripe\CMS\Model\VirtualPage; use SilverStripe\CMS\Model\RedirectorPage; use SilverStripe\Assets\File; use SilverStripe\Dev\SapphireTest; -use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore; +use Silverstripe\Assets\Dev\TestAssetStore; use Page; /** diff --git a/tests/php/Model/SiteTreeFolderExtensionTest.php b/tests/php/Model/SiteTreeFolderExtensionTest.php index ac01c0ed..d31cf235 100644 --- a/tests/php/Model/SiteTreeFolderExtensionTest.php +++ b/tests/php/Model/SiteTreeFolderExtensionTest.php @@ -4,7 +4,7 @@ namespace SilverStripe\CMS\Tests\Model; use SilverStripe\Assets\File; use SilverStripe\Assets\Image; -use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore; +use Silverstripe\Assets\Dev\TestAssetStore; use SilverStripe\CMS\Tests\Model\SiteTreeFolderExtensionTest\PageWithFile; use SilverStripe\Dev\SapphireTest; use SilverStripe\Versioned\Versioned; diff --git a/tests/php/Model/SiteTreeHTMLEditorFieldTest.php b/tests/php/Model/SiteTreeHTMLEditorFieldTest.php index 9eb05752..4793eb50 100644 --- a/tests/php/Model/SiteTreeHTMLEditorFieldTest.php +++ b/tests/php/Model/SiteTreeHTMLEditorFieldTest.php @@ -8,7 +8,7 @@ use SilverStripe\Assets\Filesystem; use SilverStripe\Forms\HTMLEditor\HTMLEditorField; use SilverStripe\Dev\CSSContentParser; use SilverStripe\Dev\FunctionalTest; -use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore; +use Silverstripe\Assets\Dev\TestAssetStore; class SiteTreeHTMLEditorFieldTest extends FunctionalTest {