From 7f7e4536f2124bd25a4964caac73c8c53d3dd65a Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 14 Jun 2023 14:09:31 -0700 Subject: [PATCH] Move around integration tests to prevent issues with flutter gherkin --- .drone.yml | 4 +- .../features/01_general/02_save_load.feature | 1 + .../{01_general => 01_tor}/03_tor.feature | 2 +- .../01_splash.feature | 3 +- integration_test/steps/overrides.dart | 2 +- integration_test/steps/text.dart | 6 +- pubspec.lock | 94 +++++++++---------- 7 files changed, 57 insertions(+), 55 deletions(-) rename integration_test/features/{01_general => 01_tor}/03_tor.feature (89%) rename integration_test/features/{01_general => 02_global_settings}/01_splash.feature (94%) diff --git a/.drone.yml b/.drone.yml index 04d8203d..bb9ba16a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -66,8 +66,8 @@ steps: - name: deps path: /root/.pub-cache commands: - # Run 01_general, 02_global_settings, and 04_profile_mgmt features... - - ./run-tests-headless.sh "01_general|02_global_settings|04_profile_mgmt" + # Run 02_global_settings, and 04_profile_mgmt features... + - ./run-tests-headless.sh "02_global_settings|04_profile_mgmt" - name: test-build-android image: openpriv/flutter-desktop:linux-fstable-3.10.2 diff --git a/integration_test/features/01_general/02_save_load.feature b/integration_test/features/01_general/02_save_load.feature index 921403d7..74c8b918 100644 --- a/integration_test/features/01_general/02_save_load.feature +++ b/integration_test/features/01_general/02_save_load.feature @@ -5,6 +5,7 @@ Feature: Settings pane opens and can save settings persistently And I tap the 'OpenSettingsView' button And I wait until the text 'Cwtch Settings' is present And I take a screenshot + And I wait for 5 seconds Scenario: Change every setting (except Language) Given I wait until the widget with type 'ProfileMgrView' is present diff --git a/integration_test/features/01_general/03_tor.feature b/integration_test/features/01_tor/03_tor.feature similarity index 89% rename from integration_test/features/01_general/03_tor.feature rename to integration_test/features/01_tor/03_tor.feature index 08a981c3..1530a083 100644 --- a/integration_test/features/01_general/03_tor.feature +++ b/integration_test/features/01_tor/03_tor.feature @@ -2,7 +2,7 @@ Feature: Tor initializes correctly Scenario: Check the Tor version Given I wait until the widget with type 'ProfileMgrView' is present And I tap the icon with type "TorIcon" - Then I expect the Tor version to be present + Then I expect the string '0.4.' to be present within 120 seconds And I expect the string 'Online' to be present within 120 seconds Scenario: Reset Tor diff --git a/integration_test/features/01_general/01_splash.feature b/integration_test/features/02_global_settings/01_splash.feature similarity index 94% rename from integration_test/features/01_general/01_splash.feature rename to integration_test/features/02_global_settings/01_splash.feature index 20f3896e..3f6432dc 100644 --- a/integration_test/features/01_general/01_splash.feature +++ b/integration_test/features/02_global_settings/01_splash.feature @@ -10,4 +10,5 @@ Feature: Splash screen displays and then closes Then I wait for the file 'integration_test/env/temp/dev/ui.globals' to exist And I expect the file 'integration_test/env/temp/dev/ui.globals' to exist And I expect the folder 'integration_test/env/temp/dev/tor' to exist - And I expect the file 'integration_test/env/temp/dev/tor/torrc' to exist \ No newline at end of file + And I expect the file 'integration_test/env/temp/dev/tor/torrc' to exist + And I wait for 5 seconds \ No newline at end of file diff --git a/integration_test/steps/overrides.dart b/integration_test/steps/overrides.dart index 26acaa66..92a9ca42 100644 --- a/integration_test/steps/overrides.dart +++ b/integration_test/steps/overrides.dart @@ -122,7 +122,7 @@ StepDefinitionGeneric ExpectTextToBePresent() { (key, seconds, context) async { await context.world.appDriver.waitUntil( () async { - await context.world.appDriver.waitForAppToSettle(); + //await context.world.appDriver.waitForAppToSettle(); return context.world.appDriver.isPresent( context.world.appDriver.findBy(key, FindType.text), diff --git a/integration_test/steps/text.dart b/integration_test/steps/text.dart index 6af94916..1a78f10e 100644 --- a/integration_test/steps/text.dart +++ b/integration_test/steps/text.dart @@ -43,14 +43,14 @@ StepDefinitionGeneric TorVersionPresent() { context.world.attach( versionString.substring(0,4), "text/plain", "Then I expect the Tor version to be present"); //context.reporter.message("test!!!", MessageLevel.info); print("looking for version string $versionString"); + return await context.world.appDriver.waitUntil(() async { - await context.world.appDriver.waitForAppToSettle(); + context.world.appDriver.waitForAppToSettle(); final finder = context.world.appDriver.findBy( versionString.substring(0,4), FindType.text, ); - final isP = context.world.appDriver.isPresent(finder); - return isP; + return await context.world.appDriver.isPresent(finder); }); }, ); diff --git a/pubspec.lock b/pubspec.lock index 91de4add..11367d5a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "405666cd3cf0ee0a48d21ec67e65406aad2c726d9fa58840d3375e7bdcd32a07" + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "60.0.0" + version: "61.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "1952250bd005bacb895a01bf1b4dc00e3ba1c526cf47dca54dfe24979c65f5b3" + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.12.0" + version: "5.13.0" archive: dependency: transitive description: @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: args - sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" async: dependency: transitive description: @@ -77,26 +77,26 @@ packages: dependency: transitive description: name: build_resolvers - sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6" + sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 url: "https://pub.dev" source: hosted - version: "2.0.10" + version: "2.2.0" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "220ae4553e50d7c21a17c051afc7b183d28a24a420502e842f303f8e4e6edced" + sha256: "5e1929ad37d48bd382b124266cb8e521de5548d406a45a5ae6656c13dab73e37" url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.4.5" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "30859c90e9ddaccc484f56303931f477b1f1ba2bab74aa32ed5d6ce15870f8cf" + sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41" url: "https://pub.dev" source: hosted - version: "7.2.8" + version: "7.2.10" built_collection: dependency: transitive description: @@ -109,10 +109,10 @@ packages: dependency: transitive description: name: built_value - sha256: "2f17434bd5d52a26762043d6b43bb53b3acd029b4d9071a329f46d67ef297e6d" + sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" url: "https://pub.dev" source: hosted - version: "8.5.0" + version: "8.6.1" characters: dependency: transitive description: @@ -149,10 +149,10 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" collection: dependency: transitive description: @@ -211,10 +211,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4" + sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.3.1" dbus: dependency: "direct main" description: @@ -278,7 +278,7 @@ packages: description: path: "." ref: main - resolved-ref: "9e89cc0d89770242a3c2e86573f9618a0dd49194" + resolved-ref: cfa8a5f93267e8b544cd705ad015dcc55d7804fa url: "https://git.openprivacy.ca/openprivacy/flutter_gherkin" source: git version: "3.0.0-rc.17" @@ -286,10 +286,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: ee6ee56855aa920899b68586b538474d086c149932220b47b92502cbfb5ba5e5 + sha256: "812791d43ccfc1b443a0d39fa02a206fc228c597e28ff9337e09e3ca8d370391" url: "https://pub.dev" source: hosted - version: "14.0.0+2" + version: "14.1.1" flutter_local_notifications_linux: dependency: transitive description: @@ -315,10 +315,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "96af49aa6b57c10a312106ad6f71deed5a754029c24789bbf620ba784f0bd0b0" + sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360" url: "https://pub.dev" source: hosted - version: "2.0.14" + version: "2.0.15" flutter_test: dependency: transitive description: flutter @@ -362,26 +362,26 @@ packages: dependency: "direct main" description: name: glob - sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" graphs: dependency: transitive description: name: graphs - sha256: "772db3d53d23361d4ffcf5a9bb091cf3ee9b22f2be52cd107cd7a2683a89ba0e" + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.1" http: dependency: transitive description: name: http - sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + sha256: "4c3f04bfb64d3efd508d06b41b825542f08122d30bda4933fb95c069d22a4fa3" url: "https://pub.dev" source: hosted - version: "0.13.6" + version: "1.0.0" http_multi_server: dependency: transitive description: @@ -447,10 +447,10 @@ packages: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" matcher: dependency: transitive description: @@ -487,10 +487,10 @@ packages: dependency: "direct dev" description: name: msix - sha256: "88ee83949d87dc635ffd51d7c17ef222390e5067693cc248046661b12a353d13" + sha256: bf151b9a1648985e7604672ade54c8df693566099d0731e318548c47d54676e6 url: "https://pub.dev" source: hosted - version: "3.12.2" + version: "3.14.2" nested: dependency: transitive description: @@ -511,10 +511,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: d39e8fbff4c5aef4592737e25ad6ac500df006ce7a7a8e1f838ce1256e167542 + sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" package_info_plus_platform_interface: dependency: transitive description: @@ -559,10 +559,10 @@ packages: dependency: transitive description: name: path_provider_linux - sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57 url: "https://pub.dev" source: hosted - version: "2.1.10" + version: "2.1.11" path_provider_platform_interface: dependency: transitive description: @@ -575,10 +575,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6 + sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.1.7" petitparser: dependency: transitive description: @@ -708,10 +708,10 @@ packages: dependency: transitive description: name: source_gen - sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d" + sha256: "373f96cf5a8744bc9816c1ff41cf5391bbdbe3d7a96fe98c622b6738a8a7bd33" url: "https://pub.dev" source: hosted - version: "1.2.6" + version: "1.3.2" source_span: dependency: transitive description: @@ -812,10 +812,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "7aac14be5f4731b923cc697ae2d42043945076cd0dbb8806baecc92c1dc88891" + sha256: eed4e6a1164aa9794409325c3b707ff424d4d1c2a785e7db67f8bbda00e36e51 url: "https://pub.dev" source: hosted - version: "6.0.33" + version: "6.0.35" url_launcher_ios: dependency: transitive description: @@ -852,10 +852,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa" + sha256: "6bb1e5d7fe53daf02a8fee85352432a40b1f868a81880e99ec7440113d5cfcab" url: "https://pub.dev" source: hosted - version: "2.0.16" + version: "2.0.17" url_launcher_windows: dependency: transitive description: @@ -932,10 +932,10 @@ packages: dependency: "direct main" description: name: window_manager - sha256: "2b2572442b2a5178642730442dc625ac088244f5827b1f0811371b1b7485eb62" + sha256: "95096fede562cbb65f30d38b62d819a458f59ba9fe4a317f6cee669710f6676b" url: "https://pub.dev" source: hosted - version: "0.3.2" + version: "0.3.4" xdg_directories: dependency: transitive description: