From 9f32e1dd963d3aeeb9843441627e3704b5660614 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Sun, 27 Aug 2023 08:06:20 +0200 Subject: [PATCH] refactor(tool,app): Use demo user for screenshots Signed-off-by: jld3103 --- packages/app/integration_test/screenshot_test.dart | 6 +++--- tool/Dockerfile.dev | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/app/integration_test/screenshot_test.dart b/packages/app/integration_test/screenshot_test.dart index d60f115c..4cf38d0b 100644 --- a/packages/app/integration_test/screenshot_test.dart +++ b/packages/app/integration_test/screenshot_test.dart @@ -52,8 +52,8 @@ Future main() async { final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized(); final account = Account( serverURL: 'http://10.0.2.2', - username: 'user1', - password: 'user1', + username: 'demo', + password: 'demo', ); setUpAll(() async { @@ -359,7 +359,7 @@ Future main() async { await binding.takeScreenshot('settings_accounts'); // Go to account settings - await tester.tap(find.text('user1@10.0.2.2:80')); + await tester.tap(find.text('demo@10.0.2.2:80')); await tester.pumpAndSettle(); await tester.tap(find.text('Automatic')); await tester.pumpAndSettle(); diff --git a/tool/Dockerfile.dev b/tool/Dockerfile.dev index 9223e626..ce5f703c 100644 --- a/tool/Dockerfile.dev +++ b/tool/Dockerfile.dev @@ -10,6 +10,7 @@ RUN ./occ app:disable password_policy RUN OC_PASS="user1" ./occ user:add --password-from-env --display-name "User One" user1 RUN OC_PASS="user2" ./occ user:add --password-from-env --display-name "User Two" user2 +RUN OC_PASS="demo" ./occ user:add --password-from-env --display-name "Demo" demo RUN ./occ app:install news --force --allow-unstable # 21.2.0 RUN ./occ app:install notes --force --allow-unstable # 4.8.0 @@ -18,5 +19,6 @@ RUN ./occ app:install uppush --force --allow-unstable # 1.4.0 RUN ./occ app:enable password_policy RUN (sh /entrypoint.sh php -S 0.0.0.0:8080 &) && \ until curl -s -o /dev/null http://localhost:8080/status.php; do true; done && \ + # Do not setup the demo user here for user in admin user1 user2; do curl -u "$user:$user" -H "ocs-apirequest: true" -s -o /dev/null http://localhost:8080/ocs/v2.php/cloud/user; done COPY --chown=www-data:www-data overlay /usr/src/nextcloud/