Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX illegal_extensions in unit tests not being honored #6760

Merged
merged 1 commit into from
Mar 30, 2017

Conversation

mikenz
Copy link
Contributor

@mikenz mikenz commented Mar 30, 2017

No description provided.

@mikenz mikenz changed the title FIX illegal_extensions in unit tests not being removed FIX illegal_extensions in unit tests not being honored Mar 30, 2017
@@ -356,15 +356,15 @@ public static function setUpBeforeClass()
continue;
}
foreach ($extensions as $extension) {
if (!class_exists($extension) ||$class::has_extension($extension)) {
if (!class_exists($extension) || !$class::has_extension($extension)) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the important change. The rest is just whitespace.

@dhensby
Copy link
Contributor

dhensby commented Mar 30, 2017

I think the test failure may well be related?

@mikenz
Copy link
Contributor Author

mikenz commented Mar 30, 2017

@dhensby
Copy link
Contributor

dhensby commented Mar 30, 2017

@mikenz ah - I've merged that and restarted the tests

@dhensby
Copy link
Contributor

dhensby commented Mar 30, 2017

Looks like the CMS test isn't getting on to well :/

@mikenz
Copy link
Contributor Author

mikenz commented Mar 30, 2017

Oh, I've fixed those locally - I'll create a PR for them too

@mikenz
Copy link
Contributor Author

mikenz commented Mar 30, 2017

Fix CMS unit tests silverstripe/silverstripe-cms#1771

@dhensby
Copy link
Contributor

dhensby commented Mar 30, 2017

Right, I seemed to have missed the PR for cms when I did the work last night- I've opened that here: silverstripe/silverstripe-cms#1772 and it looks like the tests will pass.

This PR looks good

@dhensby dhensby merged commit 2b67481 into silverstripe:master Mar 30, 2017
@mikenz mikenz deleted the patch-10 branch March 30, 2017 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants