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

Issue #3417699: Tests failing on Drupal 10 because Tests module has same name as Test Theme #73

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
################
# Includes
#
# Additional configuration can be provided through includes.
# One advantage of include files is that if they are updated upstream, the changes affect all pipelines using that include.
#
# Includes can be overridden by re-declaring anything provided in an include, here in gitlab-ci.yml
# https://docs.gitlab.com/ee/ci/yaml/includes.html#override-included-configuration-values
################

include:
################
# DrupalCI includes:
# As long as you include this, any future includes added by the Drupal Association will be accessible to your pipelines automatically.
# View these include files at https://git.drupalcode.org/project/gitlab_templates/
################
- project: $_GITLAB_TEMPLATES_REPO
ref: $_GITLAB_TEMPLATES_REF
file:
- '/includes/include.drupalci.main.yml'
- '/includes/include.drupalci.variables.yml'
- '/includes/include.drupalci.workflows.yml'

################
# Pipeline configuration variables
#
# These are the variables provided to the Run Pipeline form that a user may want to override.
#
# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml
################
variables:
SKIP_ESLINT: '1'
# Opt in to testing current minor against max supported PHP version.
OPT_IN_TEST_MAX_PHP: '1'
# Opt in to testing previous & next minor (Drupal 10.0.x and 10.2.x).
OPT_IN_TEST_PREVIOUS_MINOR: '1'
OPT_IN_TEST_NEXT_MINOR: '1'
# Opt in to testing $CORE_PREVIOUS_MAJOR (currently Drupal 9.5).
OPT_IN_TEST_PREVIOUS_MAJOR: '1'
# The 4.x branch of the CDN module requires PHP >=8.1, rather than core's >=7.4.
CORE_PREVIOUS_PHP_MIN: '8.1'
# Opt in to testing $CORE_MAJOR_DEVELOPMENT (currently Drupal 11).
OPT_IN_TEST_NEXT_MAJOR: '1'

# This module wants to strictly comply with Drupal's coding standards.
phpcs:
allow_failure: false
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- add `bamboo_render_entity_revision` rendering of entity revision - Issue #3254160 by dibix, wengerk
- add `bamboo_load_entity_revision` loading of entity revision - Issue #3254160 by dibix, wengerk
- add support of optional `alt` parameter on `bamboo_render_image` - Issue #3355084 by Ranjit1032002, thatlotnextdoor, wengerk
- add Drupal GitlabCI

## [6.0.0] - 2022-11-18
### Added
Expand Down
2 changes: 1 addition & 1 deletion bamboo_twig_config/src/TwigExtension/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Drupal\bamboo_twig_config\TwigExtension;

use Twig\TwigFunction;
use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase;
use Twig\TwigFunction;

/**
* Provides getter for configs drupal storage as Twig Extensions.
Expand Down
2 changes: 1 addition & 1 deletion bamboo_twig_extensions/src/TwigExtension/TwigArray.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Drupal\bamboo_twig_extensions\TwigExtension;

use Twig\TwigFilter;
use Twig\Extension\AbstractExtension;
use Twig\TwigFilter;

/**
* Provides bridge for Array functions and filters.
Expand Down
4 changes: 2 additions & 2 deletions bamboo_twig_extensions/src/TwigExtension/TwigDate.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Drupal\bamboo_twig_extensions\TwigExtension;

use Twig\TwigFilter;
use Drupal\Core\Template\TwigEnvironment;
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\Core\Template\TwigEnvironment;
use Twig\Extension\AbstractExtension;
use Twig\TwigFilter;

/**
* Provides bridge for Text functions and filters.
Expand Down
2 changes: 1 addition & 1 deletion bamboo_twig_extensions/src/TwigExtension/TwigText.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Drupal\bamboo_twig_extensions\TwigExtension;

use Twig\TwigFilter;
use Drupal\Core\Template\TwigEnvironment;
use Twig\Extension\AbstractExtension;
use Twig\TwigFilter;

/**
* Provides bridge for Text functions and filters.
Expand Down
4 changes: 2 additions & 2 deletions bamboo_twig_file/src/TwigExtension/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Drupal\bamboo_twig_file\TwigExtension;

use Twig\TwigFunction;
use Twig\TwigFilter;
use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase;
use Twig\TwigFilter;
use Twig\TwigFunction;

/**
* Provides a 'File' Twig Extensions.
Expand Down
6 changes: 3 additions & 3 deletions bamboo_twig_i18n/src/TwigExtension/I18n.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace Drupal\bamboo_twig_i18n\TwigExtension;

use Twig\TwigFilter;
use Twig\TwigFunction;
use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase;
use Drupal\Core\Template\TwigEnvironment;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Template\TwigEnvironment;
use Twig\TwigFilter;
use Twig\TwigFunction;

/**
* Provides some 'Internationalization' Twig Extensions.
Expand Down
2 changes: 1 addition & 1 deletion bamboo_twig_loader/src/TwigExtension/Loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Drupal\bamboo_twig_loader\TwigExtension;

use Twig\TwigFunction;
use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase;
use Drupal\Core\Entity\EntityInterface;
use Twig\TwigFunction;

/**
* Provides some loaders as Twig Extensions.
Expand Down
6 changes: 3 additions & 3 deletions bamboo_twig_loader/src/TwigExtension/Render.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

namespace Drupal\bamboo_twig_loader\TwigExtension;

use Drupal\Core\Plugin\ContextAwarePluginInterface;
use Twig\TwigFunction;
use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase;
use Drupal\Core\Block\TitleBlockPluginInterface;
use Drupal\Core\Routing\RouteObjectInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Plugin\ContextAwarePluginInterface;
use Drupal\Core\Routing\RouteObjectInterface;
use Twig\TwigFunction;

/**
* Provides some renderer as Twig Extensions.
Expand Down
2 changes: 1 addition & 1 deletion bamboo_twig_security/src/TwigExtension/Security.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Drupal\bamboo_twig_security\TwigExtension;

use Twig\TwigFunction;
use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase;
use Twig\TwigFunction;

/**
* Provides a 'Security' Twig Extensions.
Expand Down
2 changes: 1 addition & 1 deletion bamboo_twig_token/src/TwigExtension/Token.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Drupal\bamboo_twig_token\TwigExtension;

use Twig\TwigFunction;
use Drupal\bamboo_twig\TwigExtension\TwigExtensionBase;
use Twig\TwigFunction;

/**
* Provides a token rempalcement as Twig Extensions.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace Drupal\bamboo_twig_test\Controller;

use Drupal\Core\Controller\ControllerBase;
use Drupal\Component\Datetime\DateTimePlus;
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Datetime\DrupalDateTime;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Extension\ModuleExtensionList;
use Symfony\Component\DependencyInjection\ContainerInterface;

/**
* Returns renderer-responses for testing Twig functions/filters on templates.
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Functional/BambooTwigExtensionsI18nTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Drupal\Tests\bamboo_twig\Functional;

use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\Component\Gettext\PoItem;
use Drupal\language\Entity\ConfigurableLanguage;

/**
* Tests Extensions i18n of twig filters and functions.
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Functional/BambooTwigLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Drupal\Tests\bamboo_twig\Functional;

use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;
use Drupal\Core\StreamWrapper\PublicStream;
use Drupal\file\FileInterface;
use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;

/**
* Tests Loaders twig filters and functions.
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Functional/BambooTwigRenderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Drupal\Tests\bamboo_twig\Functional;

use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;
use Drupal\Core\StreamWrapper\PublicStream;
use Drupal\file\FileInterface;
use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;

/**
* Tests Renders twig filters and functions.
Expand Down
6 changes: 3 additions & 3 deletions tests/src/Functional/BambooTwigTestBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Drupal\Tests\bamboo_twig\Functional;

use Drupal\Tests\BrowserTestBase;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\field\Traits\EntityReferenceTestTrait;

/**
Expand Down Expand Up @@ -51,7 +51,7 @@ abstract class BambooTwigTestBase extends BrowserTestBase {
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'bamboo_twig_test';
protected $defaultTheme = 'bamboo_twig_theme_test';

/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Kernel/Loader/EntityBlockTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
use Drupal\block\Entity\Block;
use Drupal\block_content\Entity\BlockContent;
use Drupal\KernelTests\KernelTestBase;
use Drupal\Tests\block\Traits\BlockCreationTrait;
use Drupal\Tests\bamboo_twig\Traits\BlockCreationTrait as BambooBlockCreationTrait;
use Drupal\Tests\block\Traits\BlockCreationTrait;

/**
* @coversDefaultClass \Drupal\bamboo_twig_loader\TwigExtension\Loader
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Kernel/Render/ContentBlockTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use Drupal\block_content\Entity\BlockContent;
use Drupal\KernelTests\KernelTestBase;
use Drupal\Tests\block\Traits\BlockCreationTrait;
use Drupal\Tests\bamboo_twig\Traits\BlockCreationTrait as BambooBlockCreationTrait;
use Drupal\Tests\block\Traits\BlockCreationTrait;

/**
* @coversDefaultClass \Drupal\bamboo_twig_loader\TwigExtension\Render
Expand Down
6 changes: 3 additions & 3 deletions tests/src/Kernel/Render/ImageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace Drupal\Tests\bamboo_twig\Kernel\Render;

use Drupal\KernelTests\KernelTestBase;
use Drupal\Tests\media\Traits\MediaTypeCreationTrait;
use Drupal\Core\Render\Markup;
use Drupal\Core\StreamWrapper\PublicStream;
use Drupal\file\FileInterface;
use Drupal\Core\Render\Markup;
use Drupal\KernelTests\KernelTestBase;
use Drupal\Tests\media\Traits\MediaTypeCreationTrait;

/**
* @coversDefaultClass \Drupal\bamboo_twig_loader\TwigExtension\Render
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Bamboo Twig Test
name: Bamboo Twig Theme Test
type: theme
description: The Official Theme for Bamboo Twig Tests
base theme: starterkit_theme
Expand Down
Loading