Skip to content

Commit 17479ba

Browse files
committed
try bashunit beta
1 parent 51fe9c5 commit 17479ba

File tree

2 files changed

+8
-41
lines changed

2 files changed

+8
-41
lines changed

.github/workflows/e2e-tests.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -194,26 +194,26 @@ jobs:
194194
patch -b data/TraitOne.php < TraitOne.patch
195195
OUTPUT=$(../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/ || true)
196196
echo "$OUTPUT"
197-
../assert.sh equals `echo "$OUTPUT" | wc -l` 1
198-
../assert.sh contains 'Method TraitsCachingIssue\TestClassUsingTrait::doBar() should return stdClass but returns Exception.' "$OUTPUT"
197+
../bashunit.sh -a line_count 1 "$OUTPUT"
198+
../bashunit.sh -a contains 'Method TraitsCachingIssue\TestClassUsingTrait::doBar() should return stdClass but returns Exception.' "$OUTPUT"
199199
- script: |
200200
cd e2e/trait-caching
201201
../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/
202202
patch -b data/TraitTwo.php < TraitTwo.patch
203203
OUTPUT=$(../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/ || true)
204204
echo "$OUTPUT"
205-
../assert.sh equals `echo "$OUTPUT" | wc -l` 1
206-
../assert.sh contains 'Method class@anonymous/TestClassUsingTrait.php:20::doBar() should return stdClass but returns Exception.' "$OUTPUT"
205+
../bashunit.sh -a line_count 1 "$OUTPUT"
206+
../bashunit.sh -a contains 'Method class@anonymous/TestClassUsingTrait.php:20::doBar() should return stdClass but returns Exception.' "$OUTPUT"
207207
- script: |
208208
cd e2e/trait-caching
209209
../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/
210210
patch -b data/TraitOne.php < TraitOne.patch
211211
patch -b data/TraitTwo.php < TraitTwo.patch
212212
OUTPUT=$(../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/ || true)
213213
echo "$OUTPUT"
214-
../assert.sh equals `echo "$OUTPUT" | wc -l` 2
215-
../assert.sh contains 'Method TraitsCachingIssue\TestClassUsingTrait::doBar() should return stdClass but returns Exception.' "$OUTPUT"
216-
../assert.sh contains 'Method class@anonymous/TestClassUsingTrait.php:20::doBar() should return stdClass but returns Exception.' "$OUTPUT"
214+
../bashunit.sh -a line_count 2 "$OUTPUT"
215+
../bashunit.sh -a contains 'Method TraitsCachingIssue\TestClassUsingTrait::doBar() should return stdClass but returns Exception.' "$OUTPUT"
216+
../bashunit.sh -a contains 'Method class@anonymous/TestClassUsingTrait.php:20::doBar() should return stdClass but returns Exception.' "$OUTPUT"
217217
218218
steps:
219219
- name: "Checkout"
@@ -234,7 +234,7 @@ jobs:
234234
run: "patch src/Analyser/Error.php < e2e/PHPStanErrorPatch.patch"
235235

236236
- name: "Install bashunit"
237-
run: "curl -s https://bashunit.typeddevs.com/install.sh | bash -s e2e/ 0.12.0"
237+
run: "curl -s https://bashunit.typeddevs.com/install.sh | bash -s e2e/ beta"
238238

239239
- name: "Test"
240240
run: "${{ matrix.script }}"

e2e/assert.sh

-33
This file was deleted.

0 commit comments

Comments
 (0)