Commit Graph

443 Commits

Author SHA1 Message Date
Damian Mooyman
3f55725d62 Update documentation to match travis firefox 31ESR 2016-05-16 10:42:50 +12:00
Damian Mooyman
43298b9ae2 Merge remote-tracking branch 'origin/1.0'
# Conflicts:
#	composer.json
2016-05-11 16:10:07 +12:00
Ingo Schommer
30f944c917 Merge pull request #114 from tractorcow/pulls/1.0/respect-csrf
API Respect CSRF on login form
2016-04-20 14:03:19 +12:00
Damian Mooyman
207984e7af BUG Fix phpunit autoloading (for phpunit 3.7) 2016-04-20 12:06:32 +12:00
Ingo Schommer
be0de5e820 Updated Firefox instructions 2016-04-20 11:56:42 +12:00
Damian Mooyman
d6016d4b7a API Respect CSRF on login form 2016-04-20 11:48:20 +12:00
Damian Mooyman
5b5854c0df Merge pull request #113 from silverstripe-labs/helpful-tips-on-disabling-firefox-automatic-update
Helpful tips on disabling Firefox auto update...
2016-04-04 13:18:11 +12:00
Christopher Pitt
0186e69e99 Helpful tips on disabling Firefox auto update... 2016-04-04 13:17:07 +12:00
Ingo Schommer
805a0e69ed Merge pull request #112 from hafriedlander/fix/version_api_changes
Fix Fixture bug with new Versioned API changes in 4.x
2016-03-17 17:31:33 +13:00
Hamish Friedlander
4241f78bbc Fix Fixture bug with new Versioned API changes in 4.x 2016-03-17 17:12:33 +13:00
Ingo Schommer
4297f56352 Fixed framework dependency
Was too loose, including 4.x releases. The 1.x branch is no longer compatible with core 4.x since 350392148f
2016-02-24 22:47:41 +13:00
Ingo Schommer
7ef575c961 Don't use PHPUnit backupGlobals, break with 4.x
Unclear why PHPUnit is trying to serialize() data
through its mocking system, but this simple workaround avoids it.

https://phpunit.de/manual/4.8/en/fixtures.html#fixtures.global-state
https://github.com/sebastianbergmann/phpunit/issues/451
http://stackoverflow.com/questions/4366592/symfony-2-doctrine-2-phpunit-3-5-serialization-of-closure-exception
2016-02-24 22:24:07 +13:00
Ingo Schommer
899ed1c226 Removed PHPUnit require() reference from README
No longer required since PHPUnit 4.x
2016-02-24 21:48:18 +13:00
Ingo Schommer
350392148f Remove Behat-related code dependant on PHPUnit 3.x
We've upgraded SilverStripe core to PHPUnit 4.x now, and the Functions.php has moved locations.
Since all custom contexts either use one of these contexts, or extend off SilverStripeContext,
we can be certain that the required assertions are automatically included for custom contexts,
no need to duplicate the require_once() calls.

Note that Behat 3.x suggests using static methods on a class, e.g. PHPUnit_Framework_Assert::assertSame (see http://docs.behat.org/en/master/quick_intro.html).
This seems quite verbose, and increases the upgrade burden on any project using Behat.
2016-02-24 19:50:47 +13:00
Daniel Hensby
4010d987f9 Bump to use PHPUnit 4.8 / stable packages 2016-02-24 19:50:47 +13:00
Ingo Schommer
427fc33837 Merge pull request #111 from tractorcow/pulls/fix-asset-store
BUG Compatibility with 4.0 AsetStore API
2016-02-24 14:43:57 +13:00
Damian Mooyman
58b1d87c36 BUG Compatibility with 4.0 AssetStore API
- Don't delete Folders (managed by backend)
- Fix deletion to match correct columns
- New assertion for matching files by filename and hash
- Skip createdFilesPath - Managed by backend not by behat anymore
2016-02-24 14:32:22 +13:00
Damian Mooyman
1f5f93ddba Merge pull request #110 from chillu/pulls/fix-asset-store-compat
WIP Fix SS4 AssetStore compat in FixtureContext
2016-02-24 10:27:01 +13:00
Ingo Schommer
5728f8aabe Fix SS4 AssetStore compat in FixtureContext
Correctly create published files, and delete them via the AssetStore API rather than unlink()
2016-02-24 00:03:54 +13:00
Daniel Hensby
abb31cce69 Merge pull request #108 from helpfulrobot/add-standard-code-of-conduct-file
Added standard code of conduct file
2016-02-16 09:49:01 +00:00
helpfulrobot
2a71637fd9 Added standard code of conduct file 2016-02-16 11:44:06 +13:00
Ingo Schommer
c424b5f1fa Merge pull request #103 from silverstripe-labs/revert-96-patch-detect-404
Revert "ENH: adding wrapper around visit to detect 404s"
2016-01-26 09:20:31 +13:00
Damian Mooyman
ae7b16308e Revert "ENH: adding wrapper around visit to detect 404s" 2016-01-25 17:55:03 +13:00
Ingo Schommer
70a6d7777f Removed goutte driver from docs
Not a tested driver for framework tests. Might work, but we shouldn't recommend it. Plus, we'll need to add it as a composer requirement if mentioned in `behat.yml` (see #94).
2016-01-08 13:00:08 +13:00
Ingo Schommer
1062eb2910 Merge pull request #87 from jeffreyguo/pulls/email-plaintext
added step definition to check email contains a plain text
2016-01-08 10:44:22 +13:00
Ingo Schommer
efd8f65c33 Merge pull request #91 from jeffreyguo/pulls/email-from-to-titled
Find email by title then check the recipents
2016-01-08 10:43:29 +13:00
Ingo Schommer
676b2a4344 Merge pull request #96 from IgorNadj/patch-detect-404
ENH: adding wrapper around visit to detect 404s
2016-01-08 10:41:15 +13:00
Damian Mooyman
700e53f4f6 Merge pull request #102 from jeffreyguo/pulls/end-testsession-once
add condition to prevent running endTestSession() twice
2015-12-21 14:26:34 +13:00
Jeffrey Guo
299cde3c90 add condition to prevent running endTestSession() twice
reformatted with space indent
2015-12-21 10:54:10 +13:00
Ingo Schommer
f41bb0fc53 Merge pull request #101 from benmanu/pulls/state-yml-fixture
FIX: params isn't defined in this context
2015-12-09 08:58:41 +13:00
Ben Manu
15f1a083fc FIX: params isn't defined in this context, may be carry over from PHPUnit sessions. Changing context to $state to match other env values. 2015-12-08 11:10:19 +13:00
Ingo Schommer
ef1304a610 Fixed PHP build version compat 2015-12-03 12:22:45 +13:00
Ingo Schommer
361933537e Created 2.x branch alias for 4.x core compat 2015-12-03 12:19:57 +13:00
Ingo Schommer
cfd1044ae5 Merge pull request #100 from scott1702/confirming-element-click
Add ability to confirm/dismiss dialogs after clicking in elements
2015-10-22 16:29:44 +13:00
Ingo Schommer
95c2e069f4 Merge pull request #98 from scott1702/add-double-click
Add double click action
2015-10-22 16:29:08 +13:00
scott1702
33eb0adf0c Add ability to confirm/dismiss dialogs after clicking in elements 2015-10-22 16:27:48 +13:00
scott1702
b2ff3e73ad Add double click action 2015-10-22 16:13:47 +13:00
Damian Mooyman
6009c5bdbd Merge pull request #99 from chillu/pulls/fix-folder-creation
Fix nested folder fixture creation
2015-10-22 13:32:48 +13:00
Ingo Schommer
d39c8ebd29 Fix nested folder fixture creation
Fixes regression caused by 8d49da2609
prepareAsset('Folder','some/folder') would create some/folder/folder due to wrong ParentID relations.
Also set the 'ID' of folders to avoid creating them again.
2015-10-22 13:27:09 +13:00
Ingo Schommer
f4b5150763 Noted --name in README 2015-10-20 11:39:36 +13:00
Damian Mooyman
71cfcab8c0 Remove php 5.3 for framework 4.0 compatibility 2015-10-19 13:45:17 +13:00
Ingo Schommer
8d49da2609 Fixed Folder::find_or_make() use 2015-10-19 10:55:56 +13:00
Damian Mooyman
15b491ed74 API Update for filesystem refactor 2015-10-16 10:53:37 +13:00
Ingo Schommer
2a1e1e29d6 Merge pull request #97 from IgorNadj/patch-safety
ENH: adding safety try-catch blocks to prevent whole test suite from falling over
2015-09-10 14:58:41 +12:00
Igor Nadj
8088c29f5a ENH: adding safety try-catch blocks to prevent whole test suite from falling over 2015-09-10 14:32:09 +12:00
Igor Nadj
ed391da991 ENH: adding wrapper around visit to detect 404s 2015-09-09 16:59:06 +12:00
Damian Mooyman
e26f0a2ba5 Merge pull request #95 from chillu/pulls/testrunner-removal
Comply with moved use_test_manifest() method
2015-08-31 10:52:21 +12:00
Ingo Schommer
661bfe9a89 Comply with moved use_test_manifest() method
Moved from TestRunner to SapphireTest in 4.0.
2015-08-28 16:50:51 +12:00
Ingo Schommer
4a9db2be90 Merge pull request #93 from IgorNadj/patch-2
FIX logic error where a variable is used for two purposes
2015-08-25 15:31:07 +12:00
Igor
2ff6ddeaaa FIX logic error where a variable is used for two purposes
The issue that prompted this change was that at line 361, if an exception needed to be thrown, it would be thrown with $field being a NodeElement rather than a string, causing a Catchable Fatal Error to be thrown in ElementNotFoundException::__construct#46 (can't convert object of type NodeElement to string).
2015-08-24 14:27:56 +12:00