Skip to content

Commit 5e6fff4

Browse files
malbertsclaude
malberts
and
claude
committed
Update unit-test fixtures to assert Bootstrap 5 output
The PHP emitters now produce `data-bs-*` attributes, Bootstrap 5 class names (`rounded-pill`, `text-bg-<color>`, `btn-close`, the utility- class jumbotron set), and Bootstrap 5 `<button>` carousel indicators. Update the expected strings in: * `Components/*Test.php` — data-attribute renames, badge class renames, close-button shape, jumbotron utility classes, carousel `<ol>/<li>` -> `<div>/<button>` markup. * `ImageModalTest.php`, `ImageModalTriggerTest.php`, `ModalBuilderTest.php` — same renames inside the modal markup these tests exercise via `ModalBuilder`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent 8d11729 commit 5e6fff4

15 files changed

Lines changed: 100 additions & 100 deletions

‎tests/phpunit/Unit/CarouselGalleryTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,17 @@ public function galleryDataProvider() {
8282
'fade' => '',
8383
],
8484
[
85-
0 => '<div class="carousel slide carousel-fade firefly" style="float:space" id="youcanttakethesky" data-ride="carousel">' . PHP_EOL
86-
. '<ol class="carousel-indicators">' . PHP_EOL
87-
. "\t". '<li data-target="#youcanttakethesky" data-slide-to="0" class="active"></li>' . PHP_EOL
88-
. "\t". '<li data-target="#youcanttakethesky" data-slide-to="1"></li>' . PHP_EOL
89-
. "\t". '<li data-target="#youcanttakethesky" data-slide-to="2"></li>' . PHP_EOL
90-
. '</ol>' . PHP_EOL
85+
0 => '<div class="carousel slide carousel-fade firefly" style="float:space" id="youcanttakethesky" data-bs-ride="carousel">' . PHP_EOL
86+
. '<div class="carousel-indicators">' . PHP_EOL
87+
. "\t". '<button type="button" data-bs-target="#youcanttakethesky" data-bs-slide-to="0" class="active" aria-current="true" aria-label="Slide 1"></button>' . PHP_EOL
88+
. "\t". '<button type="button" data-bs-target="#youcanttakethesky" data-bs-slide-to="1" aria-label="Slide 2"></button>' . PHP_EOL
89+
. "\t". '<button type="button" data-bs-target="#youcanttakethesky" data-bs-slide-to="2" aria-label="Slide 3"></button>' . PHP_EOL
90+
. '</div>' . PHP_EOL
9191
. '<div class="carousel-inner">' . PHP_EOL
9292
. "\t". '<div class="carousel-item active">[[File:Mal.jpg|Malcolm Reynolds|alt=(alt) Malcolm Reynolds|class=img-fluid]]</div>' . PHP_EOL
9393
. "\t". '<div class="carousel-item">[[File:Wash.jpg|Hoban Washburne|link=/List_of_best_Pilots_in_the_Verse|class=img-fluid]]</div>' . PHP_EOL
9494
. "\t". '<div class="carousel-item">[[File:MirandaSecretFiles.pdf|(c) by Hands of Blue|page=13|float=none|class=img-fluid]]</div>' . PHP_EOL
95-
. '</div><a class="carousel-control-prev" href="#youcanttakethesky" role="button" data-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#youcanttakethesky" role="button" data-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
95+
. '</div><a class="carousel-control-prev" href="#youcanttakethesky" role="button" data-bs-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#youcanttakethesky" role="button" data-bs-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
9696
'isHTML' => true,
9797
'noparse' => true,
9898
],
@@ -104,15 +104,15 @@ public function galleryDataProvider() {
104104
],
105105
[],
106106
[
107-
0 => '<div class="carousel slide" id="bsc_carousel_0" data-ride="carousel">' . PHP_EOL
108-
. '<ol class="carousel-indicators">' . PHP_EOL
109-
. "\t". '<li data-target="#bsc_carousel_0" data-slide-to="0" class="active"></li>' . PHP_EOL
110-
. "\t". '<li data-target="#bsc_carousel_0" data-slide-to="1"></li>' . PHP_EOL
111-
. '</ol>' . PHP_EOL
107+
0 => '<div class="carousel slide" id="bsc_carousel_0" data-bs-ride="carousel">' . PHP_EOL
108+
. '<div class="carousel-indicators">' . PHP_EOL
109+
. "\t". '<button type="button" data-bs-target="#bsc_carousel_0" data-bs-slide-to="0" class="active" aria-current="true" aria-label="Slide 1"></button>' . PHP_EOL
110+
. "\t". '<button type="button" data-bs-target="#bsc_carousel_0" data-bs-slide-to="1" aria-label="Slide 2"></button>' . PHP_EOL
111+
. '</div>' . PHP_EOL
112112
. '<div class="carousel-inner">' . PHP_EOL
113113
. "\t". '<div class="carousel-item active">[[File:Mal.jpg|Malcolm Reynolds|alt=(alt) Malcolm Reynolds|class=img-fluid]]</div>' . PHP_EOL
114114
. "\t". '<div class="carousel-item">[[File:Wash.jpg|Hoban Washburne|link=/List_of_best_Pilots_in_the_Verse|class=img-fluid]]</div>' . PHP_EOL
115-
. '</div><a class="carousel-control-prev" href="#bsc_carousel_0" role="button" data-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#bsc_carousel_0" role="button" data-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
115+
. '</div><a class="carousel-control-prev" href="#bsc_carousel_0" role="button" data-bs-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#bsc_carousel_0" role="button" data-bs-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
116116
'isHTML' => true,
117117
'noparse' => true,
118118
],

‎tests/phpunit/Unit/Components/AlertTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ public function placeMeArgumentsProvider() {
8383
'dismiss_arbitrary' => [
8484
$this->input,
8585
[ 'dismissible' => 'bla' ],
86-
'<div class="alert alert-primary alert-dismissible" id="bsc_alert_NULL" role="alert">' . $this->input . '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>',
86+
'<div class="alert alert-primary alert-dismissible" id="bsc_alert_NULL" role="alert">' . $this->input . '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>',
8787
],
8888
'dismiss' => [
8989
$this->input,
9090
[ 'dismissible' => true ],
91-
'<div class="alert alert-primary alert-dismissible" id="bsc_alert_NULL" role="alert">' . $this->input . '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>',
91+
'<div class="alert alert-primary alert-dismissible" id="bsc_alert_NULL" role="alert">' . $this->input . '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>',
9292
],
9393
'fading' => [
9494
$this->input,
9595
[ 'dismissible' => 'fade', 'color' => 'warning' ],
96-
'<div class="alert alert-warning alert-dismissible fade show" id="bsc_alert_NULL" role="alert">' . $this->input . '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>',
96+
'<div class="alert alert-warning alert-dismissible fade show" id="bsc_alert_NULL" role="alert">' . $this->input . '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>',
9797
],
9898
'manual id, no dismiss' => [
9999
$this->input,

‎tests/phpunit/Unit/Components/BadgeTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function placeMeArgumentsProvider() {
6969
'simple' => [
7070
$this->input,
7171
[],
72-
'<span class="badge badge-primary" id="bsc_badge_NULL">' . $this->input . '</span>',
72+
'<span class="badge text-bg-primary" id="bsc_badge_NULL">' . $this->input . '</span>',
7373
],
7474
'empty' => [
7575
'',
@@ -79,22 +79,22 @@ public function placeMeArgumentsProvider() {
7979
'manual id' => [
8080
$this->input,
8181
[ 'id' => 'book' ],
82-
'<span class="badge badge-primary" id="book">' . $this->input . '</span>',
82+
'<span class="badge text-bg-primary" id="book">' . $this->input . '</span>',
8383
],
8484
'style and class' => [
8585
$this->input,
8686
[ 'class' => 'dummy nice', 'style' => 'float:right;background-color:#80266e' ],
87-
'<span class="badge badge-primary dummy nice" style="float:right;background-color:#80266e" id="bsc_badge_NULL">' . $this->input . '</span>',
87+
'<span class="badge text-bg-primary dummy nice" style="float:right;background-color:#80266e" id="bsc_badge_NULL">' . $this->input . '</span>',
8888
],
8989
'pill' => [
9090
$this->input,
9191
[ 'pill' => 'true' ],
92-
'<span class="badge badge-pill badge-primary" id="bsc_badge_NULL">' . $this->input . '</span>',
92+
'<span class="badge rounded-pill text-bg-primary" id="bsc_badge_NULL">' . $this->input . '</span>',
9393
],
9494
'no pill' => [
9595
$this->input,
9696
[ 'pill' => 0 ],
97-
'<span class="badge badge-primary" id="bsc_badge_NULL">' . $this->input . '</span>',
97+
'<span class="badge text-bg-primary" id="bsc_badge_NULL">' . $this->input . '</span>',
9898
],
9999
];
100100
}

‎tests/phpunit/Unit/Components/ButtonTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function testCanInjectRawAttributes() {
8080
);
8181

8282
$instance->injectRawAttributes(
83-
[ 'data-toggle' => 'foo', 'data-target' => '#bar' ]
83+
[ 'data-bs-toggle' => 'foo', 'data-bs-target' => '#bar' ]
8484
);
8585

8686
$generatedOutput = $instance->parseComponent( $parserRequest );
@@ -91,7 +91,7 @@ public function testCanInjectRawAttributes() {
9191
$this->assertMatchesRegularExpression(
9292
'~^<a class="btn btn-primary btn-md manual" role="button" id="bsc_button_NULL" href=".*/'
9393
. str_replace( ' ', '_', $this->input )
94-
. '" data-toggle="foo" data-target="#bar">' . $this->input . '</a>$~',
94+
. '" data-bs-toggle="foo" data-bs-target="#bar">' . $this->input . '</a>$~',
9595
$generatedOutput
9696
);
9797
}

‎tests/phpunit/Unit/Components/CardTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public function placeMeArgumentsProvider() {
148148
'footer-style'=> 'padding:5px',
149149
],
150150
'<div class="card border-info dummy nice" style="float:right;background-color:green">'
151-
. '<div class="card-header" style="padding:5px" data-toggle="collapse" data-target="#badgers_bowler" aria-controls="badgers_bowler" aria-expanded="true" id="badgers_bowler_header">'
151+
. '<div class="card-header" style="padding:5px" data-bs-toggle="collapse" data-bs-target="#badgers_bowler" aria-controls="badgers_bowler" aria-expanded="true" id="badgers_bowler_header">'
152152
. '<h4 class="card-title" style="margin-top:0;padding-top:0;">HEADING TEXT</h4></div>[[File:Serenity.png]]'
153153
. '<div id="badgers_bowler" class="card-collapse collapse fade show" aria-labelledby="badgers_bowler_header"><div class="card-body text-info" style="padding:5px">'
154154
. $this->input . '</div>[[File:Serenity.png|class=card-img-bottom]]<div class="card-footer" style="padding:5px">FOOTER TEXT</div></div></div>',
@@ -179,12 +179,12 @@ public function placeMeInsideAccordionArgumentsProvider() {
179179
'simple' => [
180180
$this->input,
181181
[],
182-
'<div class="card"><div class="card-header" data-toggle="collapse" data-target="#bsc_card_NULL" aria-controls="bsc_card_NULL" aria-expanded="false" id="bsc_card_NULL_header"><h4 class="card-title" style="margin-top:0;padding-top:0;">bsc_card_NULL</h4></div><div id="bsc_card_NULL" class="card-collapse collapse fade" data-parent="#accordion0" aria-labelledby="bsc_card_NULL_header"><div class="card-body">' . $this->input . '</div></div></div>',
182+
'<div class="card"><div class="card-header" data-bs-toggle="collapse" data-bs-target="#bsc_card_NULL" aria-controls="bsc_card_NULL" aria-expanded="false" id="bsc_card_NULL_header"><h4 class="card-title" style="margin-top:0;padding-top:0;">bsc_card_NULL</h4></div><div id="bsc_card_NULL" class="card-collapse collapse fade" data-bs-parent="#accordion0" aria-labelledby="bsc_card_NULL_header"><div class="card-body">' . $this->input . '</div></div></div>',
183183
],
184184
'text missing' => [
185185
'',
186186
[ 'header' => 'watch this', 'footer' => 'watch what?', 'collapsible' => 'false', ],
187-
'<div class="card"><div class="card-header" data-toggle="collapse" data-target="#bsc_card_NULL" aria-controls="bsc_card_NULL" aria-expanded="false" id="bsc_card_NULL_header"><h4 class="card-title" style="margin-top:0;padding-top:0;">watch this</h4></div><div id="bsc_card_NULL" class="card-collapse collapse fade" data-parent="#accordion0" aria-labelledby="bsc_card_NULL_header"><div class="card-body"></div><div class="card-footer">watch what?</div></div></div>',
187+
'<div class="card"><div class="card-header" data-bs-toggle="collapse" data-bs-target="#bsc_card_NULL" aria-controls="bsc_card_NULL" aria-expanded="false" id="bsc_card_NULL_header"><h4 class="card-title" style="margin-top:0;padding-top:0;">watch this</h4></div><div id="bsc_card_NULL" class="card-collapse collapse fade" data-bs-parent="#accordion0" aria-labelledby="bsc_card_NULL_header"><div class="card-body"></div><div class="card-footer">watch what?</div></div></div>',
188188
],
189189
'all attributes' => [
190190
$this->input,
@@ -198,12 +198,12 @@ public function placeMeInsideAccordionArgumentsProvider() {
198198
'heading' => 'HEADING TEXT',
199199
'footer' => 'FOOTER TEXT',
200200
],
201-
'<div class="card border-info dummy nice" style="float:right;background-color:green"><div class="card-header" data-toggle="collapse" data-target="#badgers_bowler" aria-controls="badgers_bowler" aria-expanded="true" id="badgers_bowler_header"><h4 class="card-title" style="margin-top:0;padding-top:0;">HEADING TEXT</h4></div><div id="badgers_bowler" class="card-collapse collapse fade show" data-parent="#accordion0" aria-labelledby="badgers_bowler_header"><div class="card-body text-info">' . $this->input . '</div><div class="card-footer">FOOTER TEXT</div></div></div>',
201+
'<div class="card border-info dummy nice" style="float:right;background-color:green"><div class="card-header" data-bs-toggle="collapse" data-bs-target="#badgers_bowler" aria-controls="badgers_bowler" aria-expanded="true" id="badgers_bowler_header"><h4 class="card-title" style="margin-top:0;padding-top:0;">HEADING TEXT</h4></div><div id="badgers_bowler" class="card-collapse collapse fade show" data-bs-parent="#accordion0" aria-labelledby="badgers_bowler_header"><div class="card-body text-info">' . $this->input . '</div><div class="card-footer">FOOTER TEXT</div></div></div>',
202202
],
203203
'collapsible false' => [
204204
$this->input,
205205
[ 'collapsible' => 'false', ],
206-
'<div class="card"><div class="card-header" data-toggle="collapse" data-target="#bsc_card_NULL" aria-controls="bsc_card_NULL" aria-expanded="false" id="bsc_card_NULL_header"><h4 class="card-title" style="margin-top:0;padding-top:0;">bsc_card_NULL</h4></div><div id="bsc_card_NULL" class="card-collapse collapse fade" data-parent="#accordion0" aria-labelledby="bsc_card_NULL_header"><div class="card-body">' . $this->input . '</div></div></div>',
206+
'<div class="card"><div class="card-header" data-bs-toggle="collapse" data-bs-target="#bsc_card_NULL" aria-controls="bsc_card_NULL" aria-expanded="false" id="bsc_card_NULL_header"><h4 class="card-title" style="margin-top:0;padding-top:0;">bsc_card_NULL</h4></div><div id="bsc_card_NULL" class="card-collapse collapse fade" data-bs-parent="#accordion0" aria-labelledby="bsc_card_NULL_header"><div class="card-body">' . $this->input . '</div></div></div>',
207207
],
208208
];
209209
}

‎tests/phpunit/Unit/Components/CarouselTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ public function placeMeArgumentsProvider() {
7979
'simple' => [
8080
'[[File:Mal.jpg|Malcolm Reynolds_0]]',
8181
[ '[[File:Mal.jpg|Malcolm Reynolds]]' => true, '[[File:Wash.jpg|link' => '|Hoban Washburne]]' ],
82-
'<div class="carousel slide" id="bsc_carousel_NULL" data-ride="carousel">
83-
<ol class="carousel-indicators">
84-
<li data-target="#bsc_carousel_NULL" data-slide-to="0" class="active"></li>
85-
<li data-target="#bsc_carousel_NULL" data-slide-to="1"></li>
86-
<li data-target="#bsc_carousel_NULL" data-slide-to="2"></li>
87-
</ol>
82+
'<div class="carousel slide" id="bsc_carousel_NULL" data-bs-ride="carousel">
83+
<div class="carousel-indicators">
84+
<button type="button" data-bs-target="#bsc_carousel_NULL" data-bs-slide-to="0" class="active" aria-current="true" aria-label="Slide 1"></button>
85+
<button type="button" data-bs-target="#bsc_carousel_NULL" data-bs-slide-to="1" aria-label="Slide 2"></button>
86+
<button type="button" data-bs-target="#bsc_carousel_NULL" data-bs-slide-to="2" aria-label="Slide 3"></button>
87+
</div>
8888
<div class="carousel-inner">
8989
<div class="carousel-item active">[[File:Mal.jpg|Malcolm Reynolds_0]]</div>
9090
<div class="carousel-item">[[File:Mal.jpg|Malcolm Reynolds]]</div>
9191
<div class="carousel-item">[[File:Wash.jpg|link=|Hoban Washburne]]</div>
92-
</div><a class="carousel-control-prev" href="#bsc_carousel_NULL" role="button" data-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#bsc_carousel_NULL" role="button" data-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
92+
</div><a class="carousel-control-prev" href="#bsc_carousel_NULL" role="button" data-bs-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#bsc_carousel_NULL" role="button" data-bs-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
9393
],
9494
'images missing' => [
9595
$this->input,
@@ -105,15 +105,15 @@ public function placeMeArgumentsProvider() {
105105
'fade' => true,
106106
'style' => 'float:none;background-color:black',
107107
],
108-
'<div class="carousel slide carousel-fade crew" style="float:none;background-color:black" id="bsc_carousel_NULL" data-ride="carousel">
109-
<ol class="carousel-indicators">
110-
<li data-target="#bsc_carousel_NULL" data-slide-to="0" class="active"></li>
111-
<li data-target="#bsc_carousel_NULL" data-slide-to="1"></li>
112-
</ol>
108+
'<div class="carousel slide carousel-fade crew" style="float:none;background-color:black" id="bsc_carousel_NULL" data-bs-ride="carousel">
109+
<div class="carousel-indicators">
110+
<button type="button" data-bs-target="#bsc_carousel_NULL" data-bs-slide-to="0" class="active" aria-current="true" aria-label="Slide 1"></button>
111+
<button type="button" data-bs-target="#bsc_carousel_NULL" data-bs-slide-to="1" aria-label="Slide 2"></button>
112+
</div>
113113
<div class="carousel-inner">
114114
<div class="carousel-item active">[[File:Mal.jpg|Malcolm Reynolds]]</div>
115115
<div class="carousel-item">[[File:Wash.jpg|link=|Hoban Washburne]]</div>
116-
</div><a class="carousel-control-prev" href="#bsc_carousel_NULL" role="button" data-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#bsc_carousel_NULL" role="button" data-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
116+
</div><a class="carousel-control-prev" href="#bsc_carousel_NULL" role="button" data-bs-slide="prev"><span class="carousel-control-prev-icon" aria-hidden="true"></span></a><a class="carousel-control-next" href="#bsc_carousel_NULL" role="button" data-bs-slide="next"><span class="carousel-control-next-icon" aria-hidden="true"></span></a></div>',
117117
],
118118
];
119119
}

0 commit comments

Comments
 (0)