Skip to content

Commit 5636482

Browse files
Merge branch 'develop' into feature/3526953-ckeditor-figure
2 parents 3cc08c7 + 283cc60 commit 5636482

File tree

13 files changed

+19
-362
lines changed

13 files changed

+19
-362
lines changed

tests/bats/assets.subtheme.custom.bats

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ load _helper
7777
assert_dir_exists ".components-civictheme"
7878
assert_dir_exists ".components-civictheme/01-atoms/button"
7979
assert_file_exists ".components-civictheme/01-atoms/button/button.twig"
80-
assert_dir_not_exists ".components-civictheme/01-atoms/demo-button"
81-
assert_file_exists ".components-civictheme/02-molecules/navigation-card/navigation-card.twig"
82-
assert_file_not_contains ".components-civictheme/02-molecules/navigation-card/navigation-card.twig" "Demonstration of adding an extension of the existing molecule-level"
83-
assert_file_exists ".components-civictheme/03-organisms/header/header.twig"
84-
assert_file_not_contains ".components-civictheme/03-organisms/header/header.twig" "Example of extending of the base CivicTheme component."
8580

8681
assert_dir_exists "components_combined"
8782
assert_dir_exists "components_combined/01-atoms/button"

tests/bats/assets.subtheme.sibling.bats

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,6 @@ load _helper
7878
assert_dir_exists ".components-civictheme"
7979
assert_dir_exists ".components-civictheme/01-atoms/button"
8080
assert_file_exists ".components-civictheme/01-atoms/button/button.twig"
81-
assert_dir_not_exists ".components-civictheme/01-atoms/demo-button"
82-
assert_file_exists ".components-civictheme/02-molecules/navigation-card/navigation-card.twig"
83-
assert_file_not_contains ".components-civictheme/02-molecules/navigation-card/navigation-card.twig" "Demonstration of adding an extension of the existing molecule-level"
84-
assert_file_exists ".components-civictheme/03-organisms/header/header.twig"
85-
assert_file_not_contains ".components-civictheme/03-organisms/header/header.twig" "Example of extending of the base CivicTheme component."
8681

8782
assert_dir_exists "components_combined"
8883
assert_dir_exists "components_combined/01-atoms/button"

tests/phpunit/CivicthemeCreateSubthemeScriptUnitTest.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,6 @@ public function testLocation(string $civictheme_dir, string $newtheme_rel_dir, s
147147
$this->assertStringContainsString($packagejson['homepage'], $packagejson_actual['civictheme']['homepage']);
148148
$this->assertStringContainsString($packagejson['bugs'], $packagejson_actual['civictheme']['bugs']);
149149
$this->assertStringContainsString($packagejson['repository'], $packagejson_actual['civictheme']['repository']);
150-
151-
// Examples assertions.
152-
$this->assertDirectoryExists($expected_new_theme_dir_full . 'components/01-atoms/demo-button');
153-
$this->assertDirectoryExists($expected_new_theme_dir_full . 'components/02-molecules/navigation-card');
154-
$this->assertDirectoryExists($expected_new_theme_dir_full . 'components/03-organisms/header');
155150
}
156151

157152
public static function dataProviderTestLocation(): array {
@@ -245,11 +240,6 @@ public function testExamplesRemoval(): void {
245240
$this->assertFileExists($expected_new_theme_dir_full . 'package.json');
246241
$this->assertFileExists($expected_new_theme_dir_full . 'README.md');
247242
$this->assertFileExists($expected_new_theme_dir_full . 'screenshot.png');
248-
249-
// Examples assertions.
250-
$this->assertDirectoryDoesNotExist($expected_new_theme_dir_full . 'components/01-atoms/demo-button');
251-
$this->assertDirectoryDoesNotExist($expected_new_theme_dir_full . 'components/02-molecules/navigation-card');
252-
$this->assertDirectoryDoesNotExist($expected_new_theme_dir_full . 'components/03-organisms/header');
253243
}
254244

255245
/**

web/themes/contrib/civictheme/civictheme_create_subtheme.php

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,6 @@ function process_stub(string $dir, array $options): void {
240240
}, (string) json_encode($packagejson, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
241241
file_put_contents($packagejson_file, $packagejson_encoded);
242242
}
243-
244-
// Remove all the examples component before moving to the final path.
245-
if ($options['remove_examples']) {
246-
$example_components = example_component_paths();
247-
foreach ($example_components as $example_dir) {
248-
file_remove_dir($dir . DIRECTORY_SEPARATOR . $example_dir);
249-
}
250-
}
251243
}
252244

253245
/**
@@ -556,20 +548,6 @@ function file_internal_paths(): array {
556548
return [];
557549
}
558550

559-
/**
560-
* Example component paths.
561-
*
562-
* @return array<string>
563-
* Array of example component paths.
564-
*/
565-
function example_component_paths(): array {
566-
return [
567-
'components/01-atoms/demo-button',
568-
'components/02-molecules/navigation-card',
569-
'components/03-organisms/header',
570-
];
571-
}
572-
573551
/**
574552
* Check if the file is excluded from the processing.
575553
*/

web/themes/contrib/civictheme/civictheme_starter_kit/components/01-atoms/demo-button/demo-button.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

web/themes/contrib/civictheme/civictheme_starter_kit/components/01-atoms/demo-button/demo-button.scss

Lines changed: 0 additions & 18 deletions
This file was deleted.

web/themes/contrib/civictheme/civictheme_starter_kit/components/01-atoms/demo-button/demo-button.stories.js

Lines changed: 0 additions & 71 deletions
This file was deleted.

web/themes/contrib/civictheme/civictheme_starter_kit/components/01-atoms/demo-button/demo-button.twig

Lines changed: 0 additions & 19 deletions
This file was deleted.

web/themes/contrib/civictheme/civictheme_starter_kit/components/02-molecules/navigation-card/navigation-card.stories.js

Lines changed: 0 additions & 67 deletions
This file was deleted.

web/themes/contrib/civictheme/civictheme_starter_kit/components/02-molecules/navigation-card/navigation-card.twig

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)