Skip to content

Commit 3c0e1c6

Browse files
committed
fix(runner): Ensure scenario support files (world etc) as always disposed ensure when test throws error
1 parent ed88094 commit 3c0e1c6

File tree

5 files changed

+50
-44
lines changed

5 files changed

+50
-44
lines changed

.flutter-plugins-dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]}],"date_created":"2021-09-15 14:52:31.748089","version":"2.5.0"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]}],"date_created":"2021-09-16 11:36:24.117283","version":"2.5.0"}

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [3.0.0-rc.5] - 22/06/2021
2+
3+
- Ensure scenario support files (world etc) as always disposed ensure when test throws error
4+
15
## [3.0.0-rc.4] - 21/06/2021
26

37
- Removed debug code

lib/src/flutter/runners/gherkin_integration_test_runner.dart

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -150,52 +150,54 @@ abstract class GherkinIntegrationTestRunner {
150150
tester,
151151
);
152152

153-
await hook.onBeforeScenario(
154-
configuration,
155-
name,
156-
scenarioTags,
157-
);
158-
159-
await startApp(
160-
tester,
161-
dependencies.world,
162-
);
163-
164-
await hook.onAfterScenarioWorldCreated(
165-
dependencies.world,
166-
name,
167-
scenarioTags,
168-
);
169-
170-
await reporter.onScenarioStarted(
171-
StartedMessage(
172-
Target.scenario,
153+
try {
154+
await hook.onBeforeScenario(
155+
configuration,
173156
name,
174-
debugInformation,
175157
scenarioTags,
176-
),
177-
);
158+
);
178159

179-
await runTest(dependencies);
160+
await startApp(
161+
tester,
162+
dependencies.world,
163+
);
180164

181-
await reporter.onScenarioFinished(
182-
ScenarioFinishedMessage(
165+
await hook.onAfterScenarioWorldCreated(
166+
dependencies.world,
183167
name,
184-
debugInformation,
185-
true,
186-
),
187-
);
188-
189-
await hook.onAfterScenario(
190-
configuration,
191-
name,
192-
scenarioTags,
193-
);
168+
scenarioTags,
169+
);
170+
171+
await reporter.onScenarioStarted(
172+
StartedMessage(
173+
Target.scenario,
174+
name,
175+
debugInformation,
176+
scenarioTags,
177+
),
178+
);
179+
180+
await runTest(dependencies);
181+
} finally {
182+
await reporter.onScenarioFinished(
183+
ScenarioFinishedMessage(
184+
name,
185+
debugInformation,
186+
true,
187+
),
188+
);
189+
190+
await hook.onAfterScenario(
191+
configuration,
192+
name,
193+
scenarioTags,
194+
);
194195

195-
cleanupScenarioRun(dependencies);
196+
if (onAfter != null) {
197+
await onAfter();
198+
}
196199

197-
if (onAfter != null) {
198-
await onAfter();
200+
cleanupScenarioRun(dependencies);
199201
}
200202
},
201203
timeout: scenarioExecutionTimeout,

pubspec.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ packages:
77
name: _fe_analyzer_shared
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "25.0.0"
10+
version: "26.0.0"
1111
analyzer:
1212
dependency: "direct main"
1313
description:
1414
name: analyzer
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "2.2.0"
17+
version: "2.3.0"
1818
archive:
1919
dependency: transitive
2020
description:
@@ -249,7 +249,7 @@ packages:
249249
name: pubspec_parse
250250
url: "https://pub.dartlang.org"
251251
source: hosted
252-
version: "1.0.0"
252+
version: "1.1.0"
253253
sky_engine:
254254
dependency: transitive
255255
description: flutter

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flutter_gherkin
22
description: A Gherkin / Cucumber parser and test runner for Dart and Flutter
3-
version: 3.0.0-rc.4
3+
version: 3.0.0-rc.5
44
homepage: https://github.com/jonsamwell/flutter_gherkin
55

66
environment:

0 commit comments

Comments
 (0)