Commit Graph

317 Commits

Author SHA1 Message Date
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
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