Skip to content

Commit 2941b40

Browse files
sinnbecksinnbeck
authored
Merge pull request #5 from mabdullahsari/assert-reordering
Swap word order for assertions
2 parents 5dd5030 + 7ddbc3e commit 2941b40

File tree

7 files changed

+84
-84
lines changed

7 files changed

+84
-84
lines changed

‎src/Asserts/ElementAssert.php‎ renamed to ‎src/Asserts/AssertElement.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
/**
66
* @internal
77
*/
8-
class ElementAssert extends BaseAssert
8+
class AssertElement extends BaseAssert
99
{
1010
}

‎src/Asserts/FormAssert.php‎ renamed to ‎src/Asserts/AssertForm.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* @internal
1313
*/
14-
class FormAssert extends BaseAssert
14+
class AssertForm extends BaseAssert
1515
{
1616
public function hasAction(string $action): self
1717
{
@@ -84,7 +84,7 @@ public function findSelect($selector = 'select', $callback = null): static
8484
Assert::fail(sprintf('No select found for selector: %s', $selector));
8585
}
8686

87-
$callback(new SelectAssert($this->getContent(), $select));
87+
$callback(new AssertSelect($this->getContent(), $select));
8888

8989
return $this;
9090
}

‎src/Asserts/SelectAssert.php‎ renamed to ‎src/Asserts/AssertSelect.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* @internal
1111
*/
12-
class SelectAssert extends BaseAssert
12+
class AssertSelect extends BaseAssert
1313
{
1414
public function containsOption(mixed $attributes): self
1515
{

‎src/Asserts/Traits/UsesElementAsserts.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Illuminate\Testing\Assert as PHPUnit;
66
use PHPUnit\Framework\Assert;
7-
use Sinnbeck\DomAssertions\Asserts\ElementAssert;
7+
use Sinnbeck\DomAssertions\Asserts\AssertElement;
88
use Sinnbeck\DomAssertions\Support\CompareAttributes;
99

1010
/**
@@ -43,7 +43,7 @@ public function find(string $selector, $callback = null): self
4343
);
4444

4545
if (! is_null($callback)) {
46-
$elementAssert = new ElementAssert($this->getContent(), $element);
46+
$elementAssert = new AssertElement($this->getContent(), $element);
4747
$callback($elementAssert);
4848
}
4949

‎src/TestResponseMacros.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
use DOMException;
99
use Illuminate\Testing\TestResponse;
1010
use PHPUnit\Framework\Assert;
11-
use Sinnbeck\DomAssertions\Asserts\ElementAssert;
12-
use Sinnbeck\DomAssertions\Asserts\FormAssert;
11+
use Sinnbeck\DomAssertions\Asserts\AssertElement;
12+
use Sinnbeck\DomAssertions\Asserts\AssertForm;
1313
use Sinnbeck\DomAssertions\Support\DomParser;
1414

1515
/**
@@ -47,7 +47,7 @@ public function assertElement(): Closure
4747
Assert::assertNotNull($element, sprintf('No element found with selector: %s', $selector));
4848

4949
if ($callback) {
50-
$callback(new ElementAssert($this->getContent(), $element));
50+
$callback(new AssertElement($this->getContent(), $element));
5151
}
5252

5353
return $this;
@@ -90,7 +90,7 @@ public function assertForm(): Closure
9090
'Element is not of type form!');
9191

9292
if ($callback) {
93-
$callback(new FormAssert($this->getContent(), $form));
93+
$callback(new AssertForm($this->getContent(), $form));
9494
}
9595

9696
return $this;

‎tests/DomTest.php‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
use PHPUnit\Framework\AssertionFailedError;
4-
use Sinnbeck\DomAssertions\Asserts\ElementAssert;
4+
use Sinnbeck\DomAssertions\Asserts\AssertElement;
55

66
it('can handle an empty view', function () {
77
$this->get('empty')
@@ -31,7 +31,7 @@
3131

3232
it('can find the body', function () {
3333
$this->get('nesting')
34-
->assertElement(function (ElementAssert $assert) {
34+
->assertElement(function (AssertElement $assert) {
3535
$assert->is('body');
3636
});
3737
});
@@ -51,14 +51,14 @@
5151

5252
it('can check the element has the correct type', function () {
5353
$this->get('nesting')
54-
->assertElement('#nav', function (ElementAssert $element) {
54+
->assertElement('#nav', function (AssertElement $element) {
5555
$element->is('nav');
5656
});
5757
});
5858

5959
it('can fail matching element type', function () {
6060
$this->get('nesting')
61-
->assertElement('#nav', function (ElementAssert $element) {
61+
->assertElement('#nav', function (AssertElement $element) {
6262
$element->is('div');
6363
});
6464
})->throws(
@@ -73,14 +73,14 @@
7373

7474
it('can find a nested element', function () {
7575
$this->get('nesting')
76-
->assertElement(function (ElementAssert $element) {
76+
->assertElement(function (AssertElement $element) {
7777
$element->containsDiv();
7878
});
7979
});
8080

8181
it('can find a nested element with content', function () {
8282
$this->get('nesting')
83-
->assertElement(function (ElementAssert $element) {
83+
->assertElement(function (AssertElement $element) {
8484
$element->contains('div', [
8585
'class' => 'foobar',
8686
]);
@@ -89,52 +89,52 @@
8989

9090
it('can match text content', function () {
9191
$this->get('nesting')
92-
->assertElement('span.bar', function (ElementAssert $element) {
92+
->assertElement('span.bar', function (AssertElement $element) {
9393
$element->has('text', 'Foo');
9494
});
9595
});
9696

9797
it('can match a class no matter the order', function () {
9898
$this->get('nesting')
99-
->assertElement(function (ElementAssert $element) {
99+
->assertElement(function (AssertElement $element) {
100100
$element->contains('span', [
101101
'class' => 'foo bar',
102102
]);
103-
$element->find('span', function (ElementAssert $span) {
103+
$element->find('span', function (AssertElement $span) {
104104
$span->has('class', 'foo bar');
105105
});
106106
});
107107
});
108108

109109
it('can match a partial class', function () {
110110
$this->get('nesting')
111-
->assertElement(function (ElementAssert $element) {
111+
->assertElement(function (AssertElement $element) {
112112
$element->contains('span', [
113113
'class' => 'foo bar',
114114
]);
115-
$element->find('span', function (ElementAssert $span) {
115+
$element->find('span', function (AssertElement $span) {
116116
$span->has('class', 'bar');
117117
});
118118
});
119119
});
120120

121121
it('can find multiple identical items', function () {
122122
$this->get('nesting')
123-
->assertElement(function (ElementAssert $element) {
123+
->assertElement(function (AssertElement $element) {
124124
$element->contains('div', [], 4);
125125
});
126126
});
127127

128128
it('can find multiple identical items simplified', function () {
129129
$this->get('nesting')
130-
->assertElement(function (ElementAssert $element) {
130+
->assertElement(function (AssertElement $element) {
131131
$element->contains('div', 4);
132132
});
133133
});
134134

135135
it('can find multiple identical items with content', function () {
136136
$this->get('nesting')
137-
->assertElement(function (ElementAssert $element) {
137+
->assertElement(function (AssertElement $element) {
138138
$element->contains('ul > li', [
139139
'x-data' => 'foobar',
140140
], 2);
@@ -143,7 +143,7 @@
143143

144144
it('can find multiple identical items with content ensuring no wrong matches', function () {
145145
$this->get('nesting')
146-
->assertElement(function (ElementAssert $element) {
146+
->assertElement(function (AssertElement $element) {
147147
$element->contains('div', [
148148
'x-data' => 'foobar',
149149
], 1);
@@ -152,7 +152,7 @@
152152

153153
it('can fail finding a nested element with content', function () {
154154
$this->get('nesting')
155-
->assertElement(function (ElementAssert $element) {
155+
->assertElement(function (AssertElement $element) {
156156
$element->contains('div', [
157157
'class' => 'foo',
158158
]);
@@ -161,21 +161,21 @@
161161

162162
it('can find a nested element with content functional', function () {
163163
$this->get('nesting')
164-
->assertElement(function (ElementAssert $element) {
165-
$element->findDiv(function (ElementAssert $element) {
164+
->assertElement(function (AssertElement $element) {
165+
$element->findDiv(function (AssertElement $element) {
166166
$element->is('div');
167167
});
168168
});
169169
});
170170

171171
it('can find a nested element multiple levels', function () {
172172
$this->get('nesting')
173-
->assertElement(function (ElementAssert $element) {
174-
$element->findDiv(function (ElementAssert $element) {
173+
->assertElement(function (AssertElement $element) {
174+
$element->findDiv(function (AssertElement $element) {
175175
$element->is('div');
176-
$element->find('div', function (ElementAssert $element) {
176+
$element->find('div', function (AssertElement $element) {
177177
$element->is('div');
178-
$element->findDiv(function (ElementAssert $element) {
178+
$element->findDiv(function (AssertElement $element) {
179179
$element->is('div');
180180
});
181181
});
@@ -185,12 +185,12 @@
185185

186186
it('can find a nested element multiple levels by query', function () {
187187
$this->get('nesting')
188-
->assertElement(function (ElementAssert $element) {
189-
$element->findDiv(function (ElementAssert $element) {
188+
->assertElement(function (AssertElement $element) {
189+
$element->findDiv(function (AssertElement $element) {
190190
$element->is('div');
191-
$element->find('.deep', function (ElementAssert $element) {
191+
$element->find('.deep', function (AssertElement $element) {
192192
$element->is('div');
193-
$element->findSpan(function (ElementAssert $element) {
193+
$element->findSpan(function (AssertElement $element) {
194194
$element->is('span');
195195
});
196196
});
@@ -200,8 +200,8 @@
200200

201201
it('can find a nested element multiple levels by query and attributes', function () {
202202
$this->get('nesting')
203-
->assertElement(function (ElementAssert $element) {
204-
$element->findDiv(function (ElementAssert $element) {
203+
->assertElement(function (AssertElement $element) {
204+
$element->findDiv(function (AssertElement $element) {
205205
$element->is('div');
206206
$element->contains('.deep', [
207207
'class' => 'deep',
@@ -212,8 +212,8 @@
212212

213213
it('can find a nested element and ensure doesnt contain', function () {
214214
$this->get('nesting')
215-
->assertElement(function (ElementAssert $element) {
216-
$element->findDiv(function (ElementAssert $element) {
215+
->assertElement(function (AssertElement $element) {
216+
$element->findDiv(function (AssertElement $element) {
217217
$element->is('div');
218218
$element->doesntContain('nav');
219219
});
@@ -222,8 +222,8 @@
222222

223223
it('can fail finding an contained element', function () {
224224
$this->get('nesting')
225-
->assertElement(function (ElementAssert $element) {
226-
$element->findDiv(function (ElementAssert $element) {
225+
->assertElement(function (AssertElement $element) {
226+
$element->findDiv(function (AssertElement $element) {
227227
$element->doesntContain('div');
228228
});
229229
});
@@ -234,8 +234,8 @@
234234

235235
it('can fail finding an contained element with query', function () {
236236
$this->get('nesting')
237-
->assertElement(function (ElementAssert $element) {
238-
$element->findDiv(function (ElementAssert $element) {
237+
->assertElement(function (AssertElement $element) {
238+
$element->findDiv(function (AssertElement $element) {
239239
$element->doesntContain('div.foobar');
240240
});
241241
});
@@ -247,31 +247,31 @@
247247
it('can match on livewire attributes', function () {
248248
$this->get('livewire')
249249
->assertOk()
250-
->assertElement('[wire\:model="foo"]', function (ElementAssert $element) {
250+
->assertElement('[wire\:model="foo"]', function (AssertElement $element) {
251251
$element->is('input');
252252
});
253253
});
254254

255255
it('can match has on livewire attributes', function () {
256256
$this->get('livewire')
257257
->assertOk()
258-
->assertElement('input', function (ElementAssert $element) {
258+
->assertElement('input', function (AssertElement $element) {
259259
$element->has('wire:model', 'foo');
260260
});
261261
});
262262

263263
it('can match on livewire with contains', function () {
264264
$this->get('livewire')
265265
->assertOk()
266-
->assertElement(function (ElementAssert $element) {
266+
->assertElement(function (AssertElement $element) {
267267
$element->contains('input[wire\:model="foo"]');
268268
});
269269
});
270270

271271
it('can match on livewire contains as attribute', function () {
272272
$this->get('livewire')
273273
->assertOk()
274-
->assertElement(function (ElementAssert $element) {
274+
->assertElement(function (AssertElement $element) {
275275
$element->contains('input', [
276276
'wire:model' => 'foo',
277277
]);
@@ -281,7 +281,7 @@
281281
it('can run the example from the readme', function () {
282282
$this->get(route('about'))
283283
->assertOk()
284-
->assertElement('nav > ul', function (ElementAssert $ul) {
284+
->assertElement('nav > ul', function (AssertElement $ul) {
285285
$ul->contains('li', [
286286
'class' => 'active',
287287
'text' => 'About',

0 commit comments

Comments
 (0)