Commit Graph

380 Commits

Author SHA1 Message Date
Daniel Hensby
9fc5bf254b
Merge branch '1.0' 2016-12-12 13:53:02 +00:00
Daniel Hensby
bca133254c Merge pull request #135 from BiffBangPow/pulls/1.0-given-the-current-time-is-error
Corrected variable name in givenTheCurrentTimeIs to address error in v1.0
2016-12-12 13:43:26 +00:00
William Arslett
ad7957587e Corrected variable name in givenTheCurrentTimeIs to address error 2016-12-12 12:12:11 +00:00
Damian Mooyman
04696ef5a1 Merge pull request #131 from sminnee/core-reference-fix
Core reference fix
2016-11-01 15:15:42 +13:00
Sam Minnee
8c48804b81 FIX: Reply on Core/Core.php being in include path.
This lets us change the location of Core.php as long as we also
manipulate the include path.

This is necessary for https://github.com/silverstripe/silverstripe-framework/pull/6266
2016-11-01 15:09:04 +13:00
Sam Minnee
1a18bfb341 Release 2.1 master line. 2016-09-17 15:36:56 +12:00
Ingo Schommer
df828356e7 Merge pull request #128 from sminnee/add-bootstrap-file
NEW: Add bootstrap_file extension parameter.
2016-09-14 12:54:51 +12:00
Sam Minnee
2dbe57e0cb FIX: Remove PSR2 failures 2016-09-14 12:02:37 +12:00
Sam Minnee
2c4eb2050d NEW: Add bootstrap_file extension parameter.
The bootstrap_file parameter specifies a PHP file that will be included
between Constants.php (which is included by the composer autoloader)
and Core.php (which is included by SilverStripeAwareInitializer).

The goal of this setting is to provide a bit more flexibility about how
behat test environments are set up. It’s the logical companion of
PHPUnit’s bootstrap property.
2016-09-14 12:01:41 +12:00
Damian Mooyman
c9783741ca Rename SS_ prefixed classes (#127) 2016-09-09 15:47:11 +12:00
Ingo Schommer
8c19893b63 Merge pull request #126 from open-sausages/pulls/4.0/namespace-everything
Fix include paths
2016-09-08 16:34:42 +12:00
Damian Mooyman
7e50e57766 Fix include paths 2016-09-08 16:32:06 +12:00
Ingo Schommer
1271a4e48d Merge pull request #125 from open-sausages/pulls/4.0/namespace-everything
Update for framework namespacing
2016-09-08 16:12:56 +12:00
Damian Mooyman
faca1e6f71
Update for framework namespacing 2016-09-08 10:07:35 +12:00
Daniel Hensby
ce9f6c9403 Merge pull request #124 from jeffreyguo/pulls/click-http-link-inmail
Add new step to click the http link address in email
2016-08-31 17:35:36 +01:00
jeffreyguo
0bd8033cb0 Add new step to click the http link address in email 2016-08-23 13:25:02 +12:00
Hamish Friedlander
ce3c0bb6c7 Merge pull request #123 from open-sausages/pulls/4.0/psr2
Convert to PSR-2 standard
2016-08-10 09:45:01 +07:00
Damian Mooyman
1eb1004957
Convert to PSR-2 standard
Enforce PHPCS checking
2016-08-10 13:56:30 +12:00
Hamish Friedlander
987505a576 Merge pull request #122 from open-sausages/pulls/4.0/update-versioned-tables
Update use of versioned API and respect table_name
2016-08-10 07:26:34 +07:00
Damian Mooyman
42a383030c Update use of versioned API and respect table_name 2016-08-09 12:39:31 +12:00
Hamish Friedlander
a648c7dc4d Merge pull request #120 from open-sausages/pulls/gridfield-update
Search for table title with class contains 'title', rather than class == 'title'
2016-08-04 11:00:49 +12:00
Damian Mooyman
869478ac0d
Search for table title with class contains 'title', rather than class == 'title' 2016-08-04 10:55:42 +12:00
Damian Mooyman
1d5e5816f0 Merge pull request #119 from open-sausages/hamishs_fixes
FIX iSelectFromInputGroup not understanding bootstraps input-in-label
2016-07-28 17:01:55 +12:00
Hamish Friedlander
c3ed455ec6 FIX iSelectFromInputGroup not understanding bootstraps input-in-label structure 2016-07-28 16:51:33 +12:00
Sam Minnée
b6ee213de7 Merge pull request #118 from open-sausages/pulls/4.0/namespace-security
API Apply SilverStripe\Security namespace
2016-07-07 12:26:16 +12:00
Ingo Schommer
6ea51d4f95 Merge pull request #117 from open-sausages/pulls/4.0/namespace-orm
Update to support new namespace SilverStripe\ORM
2016-07-01 15:08:28 +12:00
Damian Mooyman
8d6de532df API Apply SilverStripe\Security namespace 2016-06-29 10:31:00 +12:00
Damian Mooyman
26a95a895f Update to support new namespace SilverStripe\ORM 2016-06-27 16:34:00 +12:00
Damian Mooyman
7205b83615 Update documentation to match travis firefox 31ESR 2016-06-24 13:15:56 +12:00
Ingo Schommer
858036cc8d Updated Firefox instructions 2016-06-24 13:15:56 +12:00
Christopher Pitt
b365210744 Helpful tips on disabling Firefox auto update... 2016-06-24 13:15:56 +12:00
Ingo Schommer
e01cfba18a 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-06-24 13:15:56 +12:00
Jeffrey Guo
ba103ca8fc add condition to prevent running endTestSession() twice
reformatted with space indent
2016-06-24 13:15:56 +12:00
Ben Manu
12552dc808 FIX: params isn't defined in this context, may be carry over from PHPUnit sessions. Changing context to $state to match other env values. 2016-06-24 13:15:56 +12:00
scott1702
140c31b34f Add ability to confirm/dismiss dialogs after clicking in elements 2016-06-24 13:15:56 +12:00
scott1702
19a7c52b1d Add double click action 2016-06-24 13:15:55 +12:00
Ingo Schommer
da07643f28 Noted --name in README 2016-06-24 13:15:55 +12:00
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