diff --git a/analysis_options.yaml b/analysis_options.yaml index 69385a3..d4fcc1a 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1 +1 @@ -include: package:pedantic/analysis_options.1.9.0.yaml \ No newline at end of file +include: package:pedantic/analysis_options.yaml \ No newline at end of file diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index f4a7b94..6f955bd 100644 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -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\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\integration_test-1.0.1\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\integration_test-1.0.1\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]}],"date_created":"2021-01-07 14:23:54.911169","version":"1.22.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\integration_test-1.0.1\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\integration_test-1.0.1\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]}],"date_created":"2021-01-07 14:28:20.721377","version":"1.22.5"} \ No newline at end of file diff --git a/lib/src/flutter/steps/when_tap_widget_step.dart b/lib/src/flutter/steps/when_tap_widget_step.dart index 318089e..e9ad4a8 100644 --- a/lib/src/flutter/steps/when_tap_widget_step.dart +++ b/lib/src/flutter/steps/when_tap_widget_step.dart @@ -21,8 +21,7 @@ StepDefinitionGeneric WhenTapWidget() { RegExp( r'I tap the {string} (?:button|element|label|icon|field|text|widget)$'), (key, context) async { - final finder = - context.world.appDriver.findBy(key, FindType.key); + final finder = context.world.appDriver.findBy(key, FindType.key); await context.world.appDriver.scrollIntoView( finder, diff --git a/lib/src/flutter/world/flutter_driver_world.dart b/lib/src/flutter/world/flutter_driver_world.dart index dab72c2..6a4a354 100644 --- a/lib/src/flutter/world/flutter_driver_world.dart +++ b/lib/src/flutter/world/flutter_driver_world.dart @@ -3,7 +3,6 @@ import 'package:flutter_gherkin/flutter_gherkin.dart'; import '../flutter_run_process_handler.dart'; - class FlutterDriverWorld extends FlutterWorld { FlutterRunProcessHandler _flutterRunProcessHandler; diff --git a/lib/src/flutter/world/flutter_world.dart b/lib/src/flutter/world/flutter_world.dart index 7f704b7..688f2a3 100644 --- a/lib/src/flutter/world/flutter_world.dart +++ b/lib/src/flutter/world/flutter_world.dart @@ -15,4 +15,4 @@ abstract class FlutterWorld extends World { Future restartApp({ Duration timeout = const Duration(seconds: 60), }); -} \ No newline at end of file +} diff --git a/pubspec.lock b/pubspec.lock index e1caa5e..bff621f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -9,7 +9,7 @@ packages: source: hosted version: "12.0.0" analyzer: - dependency: transitive + dependency: "direct main" description: name: analyzer url: "https://pub.dartlang.org" @@ -469,4 +469,4 @@ packages: version: "2.2.1" sdks: dart: ">=2.10.0-110 <2.11.0" - flutter: ">=1.13.0 <2.0.0" + flutter: ">=1.17.0 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index b2db7f2..f1e556b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.2.0 homepage: https://github.com/jonsamwell/flutter_gherkin environment: - sdk: ">=2.6.0 <3.0.0" - flutter: ">=1.13.0" + sdk: ">=2.7.0 <3.0.0" + flutter: ">=1.17.0" dependencies: flutter: @@ -14,6 +14,7 @@ dependencies: sdk: flutter flutter_driver: sdk: flutter + analyzer: ">=0.37.0 <0.41.0" glob: ^1.1.7 meta: ">=1.1.6 <2.0.0" integration_test: ^1.0.1 diff --git a/test/flutter_configuration_test.dart b/test/flutter_configuration_test.dart index d979ab2..89dbe04 100644 --- a/test/flutter_configuration_test.dart +++ b/test/flutter_configuration_test.dart @@ -9,7 +9,7 @@ void main() { group('config', () { group('prepare', () { test('flutter app runner hook added', () { - final config = FlutterTestConfiguration(); + final config = FlutterDriverTestConfiguration(); expect(config.hooks, isNull); config.prepare(); expect(config.hooks, isNotNull); @@ -18,7 +18,7 @@ void main() { }); test('common steps definition added', () { - final config = FlutterTestConfiguration(); + final config = FlutterDriverTestConfiguration(); expect(config.stepDefinitions, isNull); config.prepare();