942c0257b7
API Upgrade to behat 3
2017-05-05 14:32:07 +12:00
9e563ebd3a
API Moved iShouldSeeAButton to behat-extension
2017-01-10 14:39:24 +13:00
c2a1e86f5d
Apply PSR2 / Namespace to remaining admin / tests
2016-12-19 16:08:19 +13:00
6e589aac75
API Updates to Form, ValidationResponse, ValidationException
...
API Implement form schema "errors" handling
2016-12-09 14:24:11 +13:00
c6d43b477e
Merge branch '3'
2016-11-29 13:27:49 +00:00
3a009a5849
Merge branch '3.3' into 3.4
2016-11-29 11:39:58 +00:00
9ec1d35f2b
BUG Fix behat tests unable to capture HTML editor fields
2016-11-29 14:49:39 +13:00
43917edc97
Cleanup FeatureContext
2016-11-22 16:58:01 +13:00
4ee78fc29d
BUG Restore travis artifacts ( #6277 )
...
Fixes #6046
2016-11-03 12:17:15 +13:00
d7cb38434e
Create separate cms-config.yml for cms behat tests within framework
2016-11-02 10:54:09 +13:00
c0c219e178
Fix invalid files_path
2016-11-01 17:55:43 +13:00
e386c6a153
FIX: Refactor bootstrap.php to allow for code sharing with cms bootstrap
2016-10-28 10:53:11 +13:00
e83f3962a1
BUG Prevent intermittent "Element is not currently visible and so may not be interacted with"
2016-10-25 10:42:13 +13:00
07396e4437
NEW: Move Travis behat test to run locally.
...
This shifts the behat test run to be triggered form composer activity
within the framework module directly,
* silverstripe/serve is used to provide a webserver, based on the
php -S command
* se/selenium-server-standalone is used to install selenium rather than
a download command
Because we’re using serve, the behat configuration can be locked down.
Further refinements could be made on this:
* the behat-extension could be responsible for installing and
starting/stopping selenium, making these tests more portable
* xvfb initialisation could be provided with another bin tool in the
begat-extension: vendor/bin/xvfb 1024x768
* The bootstrap-file argument to serve could be provided as part of a
composer.json setting. This would make it easier for developers to
start a dev server simply by running vendor/bin/serve
* the behat-extension could be responsible for installing and
starting/stopping silverstripe/serve, removing the need for
specifying base_url at all, and possibly utilising the same bootstrap
file between serve and behat.
2016-09-17 15:40:37 +12:00
8dd644d25d
API Namespace all classes
...
Namespace all templates
Move difflib and BBCodeParser2 to thirdparty
Remove deprecated API marked for removal in 4.0
2016-09-08 10:23:17 +12:00
4d2fd04c64
FIX Behat preview mode finder being too specific ( #5846 )
2016-07-28 17:59:31 +12:00
af22a83166
API Apply Framework\Security namespace
2016-07-07 11:32:28 +12:00
574bc6038b
Merge 3 into master
...
# Conflicts:
# CONTRIBUTING.md
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.EditForm.js
# admin/javascript/LeftAndMain.js
# admin/scss/_forms.scss
# dev/Debug.php
# docs/en/05_Contributing/01_Code.md
# forms/DropdownField.php
# model/DataObject.php
# model/Versioned.php
# model/fieldtypes/DBLocale.php
# tests/forms/gridfield/GridFieldExportButtonTest.yml
# tests/model/MoneyTest.php
# tests/model/MoneyTest.yml
# tests/model/SQLQueryTest.php
2016-05-18 18:36:10 +12:00
4d1ddf0e62
BUG Prevent session hijackers from resetting a user password
...
BUG Member::checkPassword incorrect for default admin
2016-05-16 10:54:18 +12:00
d52db0ba34
Merge 3 into master
...
# Conflicts:
# .travis.yml
# admin/css/ie7.css
# admin/css/ie7.css.map
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.js
# admin/scss/_style.scss
# admin/scss/_uitheme.scss
# control/HTTPRequest.php
# core/Object.php
# css/AssetUploadField.css
# css/AssetUploadField.css.map
# css/ConfirmedPasswordField.css.map
# css/Form.css.map
# css/GridField.css.map
# css/TreeDropdownField.css.map
# css/UploadField.css
# css/UploadField.css.map
# css/debug.css.map
# dev/Debug.php
# docs/en/00_Getting_Started/00_Server_Requirements.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
# filesystem/File.php
# filesystem/Folder.php
# filesystem/GD.php
# filesystem/Upload.php
# forms/ToggleField.php
# forms/Validator.php
# javascript/lang/en_GB.js
# javascript/lang/fr.js
# javascript/lang/src/en.js
# javascript/lang/src/fr.js
# model/Image.php
# model/UnsavedRelationList.php
# model/Versioned.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/DBField.php
# model/fieldtypes/Enum.php
# scss/AssetUploadField.scss
# scss/UploadField.scss
# templates/email/ChangePasswordEmail.ss
# templates/forms/DropdownField.ss
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
# tests/forms/EnumFieldTest.php
# tests/security/MemberTest.php
# tests/security/MemberTest.yml
# tests/security/SecurityTest.php
2016-04-29 17:50:55 +12:00
fa5b8b8fb1
BUG Fix error when modals are displayed
2016-04-22 10:31:49 +12:00
4f14175022
setup CMS Settings in one test step
2016-04-20 22:40:04 +12:00
8cf38720b5
Fix Chosen.js selector for Behat feature
...
The recent upgrade to Chosen.js 1.5 changes the generated markup:
It still renders an <a> tag, but without the "href" attribute.
This attribute isn't actually required to uniquely identify
the link in this structure.
2016-04-20 13:52:51 +12:00
fb660225c2
Behat: Wait until CMS loading overlay is removed
...
This makes tests more robust at the expense of an additional
check with every step. The "ajax steps" logic works similarly,
but does not respect the loading indicator. While this logic
waits for a short time after ajax requests are finished,
in some cases that isn't enough time for the browser to
process the response and remove the loading indicator.
Since the "ajax steps" logic applies to operations outside of the CMS
as well, we can't add the loading indicator check there.
2016-03-29 17:24:47 +13:00
2fdc96a0de
Update PHPUnit from 3.7 to 4.8
2016-02-24 21:42:20 +13:00
f20ad434ce
API Update TinyMCE to 4.x
...
API Allow HtmlEditorField to be individually configured
BUG Fix incorrect change detection
BUG Fix missing i18n files
2016-02-23 10:10:02 +13:00
3ee8f505b7
MINORE: Remove training whitespace.
...
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.
Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.
The command used was this:
for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
ae3fc84181
Add three column layout to Page content view
...
- Content filters included in SiteTree view
- View (tree/list) buttons included in SiteTree view
- Update view button styles for new layout
- Updated breadcrumbs for new layout
2015-07-02 10:22:24 +12:00
a6013ed1d0
Move filters from panel to header
...
- The filter panel has been removed in favour of a search menu in the header.
- The multi-select component has been updated:
- Now called 'Bulk actions'
- Styling updated
- Added placeholder text / removed redundant option
- Now also appears in SiteTree view
2015-06-23 13:08:23 +12:00
88fdc75456
Merge remote-tracking branch 'composer/3.1' into 3
...
Conflicts:
.editorconfig
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/00_Getting_Started/index.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/02_Developer_Guides/10_Email/index.md
docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
filesystem/File.php
filesystem/GD.php
model/DataDifferencer.php
model/Versioned.php
security/BasicAuth.php
security/Member.php
tests/filesystem/FileTest.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/VersionedTest.php
tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
c705c547fd
Behat: Ignore native dropdowns if they're not visible
...
The CmsUiContext->theIFillInTheDropdownWith() method was written
primarily for TreeDropdownField, which don't have a select tag (only an input tag).
The method currently fails for CMS dropdowns (Dropdown form field class),
since they have a hidden select tag.
I've checked through core feature files and confirmed that every use
of the method relates to TreeDropdownField, which is why this bug hasn't ocurred earlier.
2015-01-06 10:19:17 +13:00
0b1f297873
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
README.md
admin/code/LeftAndMain.php
admin/css/screen.css
admin/scss/screen.scss
api/RestfulService.php
conf/ConfigureFromEnv.php
control/injector/ServiceConfigurationLocator.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
core/Object.php
css/AssetUploadField.css
css/ComplexTableField_popup.css
dev/CSSContentParser.php
dev/DevelopmentAdmin.php
docs/en/changelogs/index.md
docs/en/misc/contributing/code.md
docs/en/reference/execution-pipeline.md
filesystem/GD.php
filesystem/ImagickBackend.php
filesystem/Upload.php
forms/Form.php
forms/FormField.php
forms/HtmlEditorConfig.php
forms/gridfield/GridFieldDetailForm.php
forms/gridfield/GridFieldSortableHeader.php
lang/en.yml
model/Aggregate.php
model/DataList.php
model/DataObject.php
model/DataQuery.php
model/Image.php
model/MySQLDatabase.php
model/SQLQuery.php
model/fieldtypes/HTMLText.php
model/fieldtypes/Text.php
scss/AssetUploadField.scss
search/filters/SearchFilter.php
security/Authenticator.php
security/LoginForm.php
security/Member.php
security/MemberAuthenticator.php
security/MemberLoginForm.php
security/Security.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
tests/control/HTTPTest.php
tests/control/RequestHandlingTest.php
tests/filesystem/UploadTest.php
tests/forms/FormTest.php
tests/forms/NumericFieldTest.php
tests/model/DataListTest.php
tests/model/DataObjectTest.php
tests/model/TextTest.php
tests/security/MemberAuthenticatorTest.php
tests/security/SecurityDefaultAdminTest.php
tests/view/SSViewerCacheBlockTest.php
tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
49cb38dfc1
BUG Fix static call to protected instance method
2014-10-20 17:04:25 +13:00
1f5f2a1798
Updated html field to support quotes
2014-09-12 15:09:12 +12:00
eb069e605d
Remove all redundant whitespace
2014-08-19 09:17:15 +12:00
5519a026e8
expand a tree node and check a CMS tab
2014-07-30 17:17:08 +12:00
b4bfb75a0d
Merge pull request #3207 from chillu/pulls/behat-gridfield
...
Moved table-related feature steps to behat extension
2014-06-17 13:43:33 +12:00
a433fa2ec4
Moved table-related feature steps to behat extension
...
Reused for tables other than GridField.
See https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/51
2014-06-13 15:10:16 +12:00
4fdfff8a23
Update for Mink 1.6 compatibility
2014-05-30 15:46:54 +12:00
0b4f62dfd8
BUG Fix jstree when duplicating subtrees
2014-04-29 16:00:07 +12:00
38609c0762
Add Behat behaviours to click links and submit forms in preview.
2014-04-01 11:04:42 +13:00
1d5706f15c
Correct line length and indentation
2014-03-30 21:11:56 +13:00
66b60cb486
Merge pull request #2754 from madmatt/pulls/behat-profile
...
Allow GridFields without titles to be found.
2014-03-15 21:13:06 +13:00
80997171cc
Updated Expand CMS Panel to find first visible panel and added new test file
2014-02-18 11:17:31 +13:00
4f7c6ebcff
FIX: Fixed behat text selection rule, which broke some tests.
...
The behat rule for text selection wasn't working due to the JavaScript not executing properly. I have
also updated the code to traverse all childNodes, which is important if you have text like this:
<p>text1 <b>text2</b> text3</p>
And you are trying to select 'text3'
2014-02-13 17:36:46 +13:00
267786a7d1
Add behat test for security permission checkboxes.
2014-02-07 15:41:33 +13:00
e91f10b0ab
Add Behat step to click on a row in the first GridField table.
2014-02-07 15:40:06 +13:00
0eaae90bdb
Update theHtmlFieldShouldContain step to include negation.
...
This allows steps to be declared as either “should contain” or “should not
contain”.
2014-01-06 17:22:40 +13:00
2b00036d9d
Allow GridFields without titles to be found.
2014-01-06 10:20:44 +13:00
7d271d5346
Fix profile.feature behat test
2013-12-20 12:32:44 +13:00
a7ad85c2a8
Better "editable page" Behat assertion
2013-12-02 19:07:14 +01:00
df2d59df1c
Use more solid getValue() in Behat assertions
...
getAttribute('value') behaves inconsistently with Selenium drivers
(fails on Travis and TeamCity, but works locally). Selenium2Driver
in Mink provides a JS wrapper for getting the value, which is more reliable.
This fixes "insert a link" failures, see https://travis-ci.org/silverstripe/silverstripe-cms/jobs/14281251
2013-11-30 13:27:20 +01:00
3a8833ec28
Fixing broken manage-users behat test.
...
"ADMIN group" is created by default, but assertions are checking
for "Admin Group".
2013-11-29 14:51:46 +13:00
cfc009964c
Fixing undefined step caused by change in behat-extensio module.
2013-11-29 14:17:04 +13:00
784c766ee6
Revert "Don't rely on Behat/Selenium returning 'value' for textarea"
...
This reverts commit 8245125349
2013-11-22 20:38:56 +01:00
8245125349
Don't rely on Behat/Selenium returning 'value' for textarea
...
Technically a textarea DOM node doesn't have a 'value' attribute,
but rather a HTML content. This used to work, but likely broke either
by updated browser handling or updated selenium logic.
Fixes "Scenario: I can edit title and content and see the changes on draft"
2013-11-22 20:05:17 +01:00
bd5fdf1f19
Fixing coding conventions in Behat files
2013-11-15 12:03:43 +01:00
39efaca54f
Disable "lost password" feature, breaks on "php -S"
...
PHP's built-in webserver doesn't reliably expose SCRIPT_NAME,
see https://github.com/silverstripe/silverstripe-framework/issues/2580 .
This breaks URL routing on /Security/passwordsent/admin%40test.com
2013-10-22 15:26:20 +02:00
56d7c1fde2
Behat tests for lost password
2013-10-22 00:06:36 +02:00
5c1a9d9da5
Using Behat EmailContext by default
2013-10-21 00:50:29 +02:00
e489384eea
Moved manage-files.feature to cms module
2013-10-08 11:21:36 +02:00
8d5209aef6
Migrated page-specific behat features to cms module
2013-10-08 00:24:05 +02:00
6a665b4ca2
Behat jQuery reference
2013-10-07 23:44:13 +02:00
21c226a5d2
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-09-30 23:44:12 +02:00
a68e0ba365
Check for jQuery in Behat tests
...
Identified as one potential cause for flickering tests
on our own Selenium box.
2013-09-30 23:36:46 +02:00
a87000170a
Behat: "apply formatting" steps
2013-09-15 01:50:10 +02:00
849f2c1cb1
Behat: "insert external link" feature
2013-09-14 19:50:22 +02:00
d68a016026
Behat: Friendler field reference
2013-09-14 19:50:21 +02:00
2fbe0c39f2
Behat: Correctly quote selector in dropdown step
2013-09-14 19:50:21 +02:00
c9047a386f
Behat: "insert link" feature
2013-09-14 19:50:21 +02:00
7a4a1bbadb
Behat: More "insert image" steps
...
Still needs definitions
2013-09-14 19:50:21 +02:00
e202d4b3b0
Behat: Avoid false positives in dropdown traversal
...
Was identifying fields like <input value="Select a page">
when querying for a drop down labelled "Page"
2013-09-14 19:50:21 +02:00
8de227554e
Behat: More verbose error message in HTML field assertion
2013-09-14 19:50:21 +02:00
fde6b65769
Behat: Allow quoted HTML in assertion
2013-09-14 19:50:21 +02:00
35a32d608d
More specific behat tree assertion
2013-09-14 19:50:21 +02:00
5a0b4b0f03
Shorter behat feature name
...
Looks better in relishapp ;)
2013-09-13 18:52:02 +02:00
819eebb5dc
Behat: Profile feature (steps only)
2013-09-13 18:44:17 +02:00
aa80c4eed2
Behat feature indentation (no content changes)
2013-09-13 18:42:27 +02:00
e6f7f637f3
Added feature file for behat test
...
- Added content formatting behat feature file Updated Given statement for Insert link behat feature file
- Added Behat test feature file for alignment buttons Updated formatting buttons feature file to include strikethrough formatting
2013-09-13 17:00:43 +02:00
eb311691be
Fixed 3.1-specific switchToWindow() behat feature
2013-08-22 14:10:54 +02:00
40c239076b
Merge remote-tracking branch 'origin/3.0' into 3.1.0
...
Conflicts:
model/Hierarchy.php
2013-08-22 12:55:47 +02:00
54edc0ddac
Fix Behat window switching in chrome
...
Workaround only, see https://groups.google.com/forum/#!topic/behat/QNhOuGHKEWI
2013-08-22 12:49:38 +02:00
c66cc952d2
Correct line length and indentation
2013-08-21 21:27:16 +12:00
2fd5558a70
Fixed "insert image" behat feature
...
Was using wrong button label, and ignoring the
"unsaved changes" warning dialog
2013-08-20 16:19:30 +02:00
de3b1b22d3
Fixed behat tests for confirming grid field dialogs
2013-08-16 13:34:23 +02:00
362d35742f
Fixed behat tests to confirm file deletion dialog
2013-08-16 13:34:23 +02:00
a6c3d1e269
Flag "insert image" behat test as @assets
...
Required in order to run them remotely, which currently
doesn't support file upload through Selenium
2013-06-28 12:21:00 +02:00
2160fb8000
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/javascript/LeftAndMain.js
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
tests/control/ControllerTest.php
2013-06-19 14:03:43 +02:00
574c11a834
Behat: "Insert image from web" feature
...
Partially fixes https://github.com/silverstripe/silverstripe-cms/issues/628
Modified a bit by Ingo :)
2013-06-07 16:10:21 +02:00
fd6060e7be
Behat: More robust "field should contain" logic
2013-06-07 16:02:29 +02:00
924664527b
Less assumptions in "HTML field contains" step
...
Not using the loose idea of a "field name" in the NamedSelector
sense of the word as "field with id exists".
2013-06-07 15:46:05 +02:00
7dfe5ccbd2
Limit "should see a button" to actually visible elements
2013-06-07 15:45:15 +02:00
17bca1db86
Behat: Adding context for 'Given I should not see a "xxx" button'
2013-06-07 12:06:01 +02:00
ff5624c57e
BUG Fixed dropdown step definition for "preview" dropdowns
...
Broke after I optimized it to work with a TreeDropdownField
which assumes <li><a> structures that thie "preview" dropdowns
don't have. I also failed at the recursion assignment, causing
infinite loops...
2013-06-07 11:45:09 +02:00
4603378e00
Behat: Fixed step notation
2013-06-06 15:26:50 +02:00
7791f20f49
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
2013-06-05 15:17:06 +02:00
d3a4161a94
Behat: Backport improved dropdown step handler
2013-06-05 14:59:01 +02:00
1d01347fd3
Behat: Use explicit fixtures
2013-06-05 14:32:42 +02:00
f8b1c08c67
Behat: Copy fixture identifier to "Name" or "Title" by default
...
This makes fixture setup less verbose, particularly for behat
tests (e.g. with "Given a page 'About Us'")
2013-06-05 14:32:42 +02:00
bb92e494d7
Behat fixture refactoring (shared factory instance)
2013-06-05 14:32:42 +02:00
Damian Mooyman
Daniel Hensby
Sam Minnee
Hamish Friedlander
Jeffrey Guo
Ingo Schommer
David Craig
Sean Harvey
Mateusz Uzdowski
Simon Welsh
Sriram Venkatesh
madmatt
Matt Peel
Sean Harvey
mandrew
lukepercy
Mike Parkhill
Stig Lindqvist