Skip to content

Commit e332178

Browse files
committed
GH-291: Drupal 9 compatibility. Fix tests
1 parent 3b99ed9 commit e332178

File tree

20 files changed

+32
-10
lines changed

20 files changed

+32
-10
lines changed

.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ sudo: required
22
language: php
33

44
php:
5-
- 7.1
6-
- 7.2
5+
- 7.3
6+
- 7.4
77

88
services:
99
- docker
@@ -12,13 +12,13 @@ env:
1212
global:
1313
- DOCKER_COMPOSE_VERSION=1.17.1
1414
matrix:
15-
- DRUPAL_VERSION=~8.6
1615
- DRUPAL_VERSION=~8.7
17-
- DRUPAL_VERSION=8.8.x-dev
16+
- DRUPAL_VERSION=~8.8
17+
- DRUPAL_VERSION=9.0.x-dev
1818

1919
matrix:
2020
allow_failures:
21-
- env: DRUPAL_VERSION=8.8.x-dev
21+
- env: DRUPAL_VERSION=9.0.x-dev
2222

2323
before_install:
2424
- docker-compose up -d
@@ -32,4 +32,4 @@ script:
3232
- docker-compose exec -u www-data php ./vendor/bin/phpunit
3333

3434
notifications:
35-
email: false
35+
email: false

modules/ui_patterns_ds/tests/modules/ui_patterns_ds_test/ui_patterns_ds_test.info.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: 'UI Patterns Display Suite Test'
22
type: module
33
description: 'Test module for UI Patterns.'
44
core: 8.x
5+
core_version_requirement: ^8 || ^9
56
hidden: true
67
package: 'User interface'
78
dependencies:

modules/ui_patterns_ds/ui_patterns_ds.info.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: UI Patterns Display Suite
22
type: module
33
description: Use patterns as Display Suite field templates. It also provides Display Suite pattern sources.
44
core: 8.x
5+
core_version_requirement: ^8 || ^9
56
package: User interface
67
dependencies:
78
- ds:ds

modules/ui_patterns_field_group/tests/modules/ui_patterns_field_group_test/ui_patterns_field_group_test.info.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: 'UI Patterns Field Group Test'
22
type: module
33
description: 'Test module for UI Patterns.'
44
core: 8.x
5+
core_version_requirement: ^8 || ^9
56
hidden: true
67
package: 'User interface'
78
dependencies:

modules/ui_patterns_field_group/ui_patterns_field_group.info.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: UI Patterns Field Group
22
type: module
33
description: Use patterns as field groups templates.
44
core: 8.x
5+
core_version_requirement: ^8 || ^9
56
package: User interface
67
dependencies:
78
- field_group:field_group

modules/ui_patterns_layouts/tests/modules/ui_patterns_layouts_test/ui_patterns_layouts_test.info.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: 'UI Patterns Layouts Test'
22
type: module
33
description: 'Test module for UI Patterns.'
44
core: 8.x
5+
core_version_requirement: ^8 || ^9
56
hidden: true
67
package: 'User interface'
78
dependencies:

modules/ui_patterns_layouts/ui_patterns_layouts.info.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: UI Patterns Layouts
22
type: module
33
description: Use patterns as layouts via the Layout Discovery module.
44
core: 8.x
5+
core_version_requirement: ^8 || ^9
56
package: User interface
67
dependencies:
78
- drupal:layout_discovery
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
name: 'UI Patterns bad definition test'
22
type: module
33
core: 8.x
4+
core_version_requirement: ^8 || ^9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
name: 'UI Patterns library module test'
22
type: module
33
core: 8.x
4+
core_version_requirement: ^8 || ^9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: 'UI Patterns library theme test'
22
type: theme
33
core: 8.x
4-
base theme: stable
4+
core_version_requirement: ^8 || ^9
5+
base theme: stark

modules/ui_patterns_library/ui_patterns_library.info.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: UI Patterns Library
22
type: module
33
description: Exposed patterns in you modules and themes and display them in a pattern library page.
44
core: 8.x
5+
core_version_requirement: ^8 || ^9
56
package: User interface
67
dependencies:
78
- ui_patterns:ui_patterns

modules/ui_patterns_views/tests/modules/ui_patterns_views_test/config/install/views.view.articles.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ tag: ''
1515
base_table: node_field_data
1616
base_field: nid
1717
core: 8.x
18+
core_version_requirement: ^8 || ^9
1819
display:
1920
default:
2021
display_plugin: default

modules/ui_patterns_views/tests/modules/ui_patterns_views_test/ui_patterns_views_test.info.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: 'UI Patterns Views Test'
22
type: module
33
description: 'Test module for UI Patterns.'
44
core: 8.x
5+
core_version_requirement: ^8 || ^9
56
hidden: true
67
package: 'User interface'
78
dependencies:

modules/ui_patterns_views/ui_patterns_views.info.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: UI Patterns Views
22
type: module
33
description: Use patterns as Views templates.
44
core: 8.x
5+
core_version_requirement: ^8 || ^9
56
package: User interface
67
dependencies:
78
- drupal:views
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
name: 'UI Patterns field source test'
22
type: module
33
core: 8.x
4+
core_version_requirement: ^8 || ^9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
name: 'UI Patterns Render Test'
22
type: module
33
core: 8.x
4+
core_version_requirement: ^8 || ^9

tests/src/Functional/UiPatternsPreviewRenderTest.php

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
*/
1313
class UiPatternsPreviewRenderTest extends BrowserTestBase {
1414

15+
/**
16+
* Default theme. See https://www.drupal.org/node/3083055.
17+
*
18+
* @var string
19+
*/
20+
protected $defaultTheme = 'stark';
21+
1522
/**
1623
* Disable schema validation when running tests.
1724
*

tests/src/Kernel/Plugin/Deriver/YamlDeriverTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Drupal\ui_patterns\UiPatterns;
77

88
/**
9-
* @coversDefaultClass \Drupal\ui_patterns\Plugin\Deriver\YamlDeriver
9+
* @coversDefaultClass \Drupal\ui_patterns\Plugin\Deriver\AbstractPatternsDeriver
1010
*
1111
* @group ui_patterns
1212
*/

tests/src/Kernel/Plugin/PatternBaseTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class PatternBaseTest extends AbstractUiPatternsTest {
1717
*
1818
* @dataProvider hookLibraryInfoBuildDataProvider
1919
*
20-
* @covers ::hookLibraryInfoBuild
20+
* @covers ::getLibraryDefinitions
2121
*/
2222
public function testHookLibraryInfoBuild($actual, $expected) {
2323
$pattern = $this->getUiPatternBaseMock($actual);

tests/src/Kernel/UiPatternsManagerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class UiPatternsManagerTest extends AbstractUiPatternsTest {
2121
/**
2222
* Test UiPatternsManager::getPatternDefinition.
2323
*
24-
* @covers ::getPatternDefinition
24+
* @covers ::getPatterns
2525
*/
2626
public function testGetPattern() {
2727
$manager = UiPatterns::getManager();

0 commit comments

Comments
 (0)