From 0a64b07b2c25b39ec89dbbe1f8aaa213e9184386 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 13 Sep 2018 19:00:04 +0200 Subject: [PATCH 1/2] NEW Use Bootstrap alerts throughout the CMS --- templates/SilverStripe/Security/CMSSecurity_login.ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/SilverStripe/Security/CMSSecurity_login.ss b/templates/SilverStripe/Security/CMSSecurity_login.ss index a4834f0b6..cd02e2032 100644 --- a/templates/SilverStripe/Security/CMSSecurity_login.ss +++ b/templates/SilverStripe/Security/CMSSecurity_login.ss @@ -7,7 +7,7 @@ <% with $Form %> <% if $Message %> -
+

$Message

<% end_if %> From 274657f4f815cfb990c23b39ab81c1def91b37ad Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 14 Sep 2018 11:19:53 +0200 Subject: [PATCH 2/2] FIX Add support in "I should see a message" step definition for Bootstrap alerts --- tests/behat/src/CmsUiContext.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/behat/src/CmsUiContext.php b/tests/behat/src/CmsUiContext.php index 209835615..aea6f2ea1 100644 --- a/tests/behat/src/CmsUiContext.php +++ b/tests/behat/src/CmsUiContext.php @@ -85,7 +85,13 @@ class CmsUiContext implements Context */ public function iShouldSeeAMessage($message) { - $this->getMainContext()->assertElementContains('.message', $message); + $page = $this->getMainContext()->getSession()->getPage(); + if ($page->find('css', '.message')) { + $this->getMainContext()->assertElementContains('.message', $message); + } else { + // Support for new Bootstrap alerts + $this->getMainContext()->assertElementContains('.alert', $message); + } } protected function getCmsTabsElement()