From c5a1172574d4fc06ba339338b351cedc1a3d8d5e Mon Sep 17 00:00:00 2001 From: Chris Hirt Date: Thu, 10 Mar 2022 14:54:52 +0700 Subject: [PATCH] simplify logic in template / tweak E2E tests change assertion to isDisplayed() simplify logic in template - rename displayHeaderButtons back to displayShareButton - displayShareButton is only for share button, not for settings button - remove CSS app-settings-available and put logic directly in template ng-if fix flaky test This test asserts that the settingsMenuLink is not present, and the appropriate test should be `isPresent()` not `isDisplayed()` --- .../container/languageforge.html.twig | 4 ++-- .../languageforge/theme/default/sass/_global.scss | 14 +------------- src/angular-app/bellows/core/navbar.controller.ts | 10 +++++----- test/app/bellows/project-settings.e2e-spec.ts | 2 +- .../lexicon/settings/config-fields.e2e-spec.ts | 2 +- .../settings/config-input-systems.e2e-spec.ts | 4 ++-- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/Site/views/languageforge/container/languageforge.html.twig b/src/Site/views/languageforge/container/languageforge.html.twig index 9b48bf6ad1..61aa16e198 100644 --- a/src/Site/views/languageforge/container/languageforge.html.twig +++ b/src/Site/views/languageforge/container/languageforge.html.twig @@ -81,7 +81,7 @@