Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2787655: Fix \Drupal\Tests\Core\Form\FormTestBase to not have multiple namespaces

8.3.x
Nathaniel Catchpole 2016-08-22 17:01:56 +01:00
parent 50ab536e79
commit 37010da991
2 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/tests/Drupal/Tests/Core/Form/FormTestBase.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Drupal\Tests\Core\Form { namespace Drupal\Tests\Core\Form;
use Drupal\Component\Utility\Html; use Drupal\Component\Utility\Html;
use Drupal\Core\Form\FormBuilder; use Drupal\Core\Form\FormBuilder;
@ -147,6 +147,9 @@ abstract class FormTestBase extends UnitTestCase {
protected function setUp() { protected function setUp() {
parent::setUp(); parent::setUp();
// Add functions to the global namespace for testing.
require_once __DIR__ . '/fixtures/form_base_test.inc';
$this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface'); $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
$this->formCache = $this->getMock('Drupal\Core\Form\FormCacheInterface'); $this->formCache = $this->getMock('Drupal\Core\Form\FormCacheInterface');
@ -311,35 +314,3 @@ abstract class FormTestBase extends UnitTestCase {
} }
} }
}
namespace {
function test_form_id() {
$form['test'] = array(
'#type' => 'textfield',
'#title' => 'Test',
);
$form['options'] = array(
'#type' => 'radios',
'#options' => array(
'foo' => 'foo',
'bar' => 'bar',
),
);
$form['value'] = array(
'#type' => 'value',
'#value' => 'bananas',
);
$form['actions'] = array(
'#type' => 'actions',
);
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => 'Submit',
);
return $form;
}
}

38
core/tests/Drupal/Tests/Core/Form/fixtures/form_base_test.inc Normal file
View File

@ -0,0 +1,38 @@
<?php
/**
* @file
* Functions in the global namespace for \Drupal\Tests\Core\Form\FormTestBase.
*/
/**
* Creates a test form.
*
* @return array
* The form array
*/
function test_form_id() {
$form['test'] = array(
'#type' => 'textfield',
'#title' => 'Test',
);
$form['options'] = array(
'#type' => 'radios',
'#options' => array(
'foo' => 'foo',
'bar' => 'bar',
),
);
$form['value'] = array(
'#type' => 'value',
'#value' => 'bananas',
);
$form['actions'] = array(
'#type' => 'actions',
);
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => 'Submit',
);
return $form;
}