Skip to content

Commit b8136b9

Browse files
committed
Fix tests
1 parent f5a5bbe commit b8136b9

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

scripts/sut-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function dcg_phpcs {
6363
function dcg_phpunit {
6464
SIMPLETEST_BASE_URL=http://$dcg_drupal_host:$dcg_drupal_port \
6565
SIMPLETEST_DB=sqlite://localhost//$drupal_dir/sites/default/files/dcg_test.sqlite \
66-
MINK_DRIVER_ARGS_WEBDRIVER='["chrome", {"chromeOptions": {"w3c": false, "args": ["--headless"]}}, "'$dcg_wd_url'"]' \
66+
MINK_DRIVER_ARGS='["chrome", {"goog": {"w3c": false, "args": ["--headless"]}}, "'$dcg_wd_url'"]' \
6767
$drupal_dir/vendor/bin/phpunit -c $drupal_dir/core "$@"
6868
}
6969

src/Command/Navigation.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,11 @@ final class Navigation extends Command implements IOAwareInterface, LoggerAwareI
2727

2828
/**
2929
* Menu tree.
30-
*
31-
* @var array
3230
*/
3331
private array $menuTree = [];
3432

3533
/**
3634
* Menu labels.
37-
*
38-
* @var array
3935
*/
4036
private array $labels = [
4137
'misc:d7' => 'Drupal 7',
@@ -173,7 +169,7 @@ private function selectGenerator(InputInterface $input, OutputInterface $output,
173169
}
174170

175171
/**
176-
* Sort multi-dimensional array by keys.
172+
* Sort multidimensional array by keys.
177173
*
178174
* @param array $array
179175
* An array being sorted.

tests/functional/Generator/_phpstorm_meta/.phpstorm.meta.php/fields.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
'revision_user',
1616
'revision_log',
1717
'status',
18-
'uid',
1918
'info',
2019
'changed',
2120
'reusable',

tests/sut/qux/tests/src/FunctionalJavascript/FieldBaseTest.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ abstract class FieldBaseTest extends WebDriverTestBase {
2424
/**
2525
* {@inheritdoc}
2626
*/
27-
protected static $modules = ['qux', 'node', 'field_ui'];
27+
protected static $modules = ['qux', 'node', 'field_ui', 'block'];
2828

2929
/**
3030
* {@inheritdoc}
@@ -46,11 +46,15 @@ protected function setUp(): void {
4646

4747
// Create text field.
4848
$this->drupalGet('admin/structure/types/manage/test/fields/add-field');
49-
$page = $this->getSession()->getPage();
50-
$page->selectFieldOption('new_storage_type', 'string');
51-
$page->fillField('label', 'Wine');
49+
50+
$driver = $this->getSession()->getDriver();
51+
$driver->click('//input[@name = "new_storage_type" and @value = "plain_text"]');
52+
$driver->click('//input[@value = "Continue"]');
53+
$driver->setValue('//input[@name = "label"]', 'Wine');
54+
$driver->setValue('//input[@name = "group_field_options_wrapper"]', 'string');
5255
$this->assertSession()->waitForElementVisible('css', '#edit-label-machine-name-suffix');
53-
$page->pressButton('Save and continue');
56+
$driver->click('//input[@value = "Continue"]');
57+
$driver->click('//input[@value = "Save settings"]');
5458
}
5559

5660
/**

0 commit comments

Comments
 (0)