open_social icon indicating copy to clipboard operation
open_social copied to clipboard

Issue #3443501: Set the end date required

Open Macsym2018 opened this issue 10 months ago • 2 comments

Problem

Currently, end date of an event is an option field. This causes some issues in Calendar block, custom content lists, overviews and more. We want to make this field required so that when an event is created or edited, these value will have to be provided.

Solution

  • Make the end date of the event required
  • As a Vu+ I need to specify an end date and time when I create or edit an event
  • There is a visual indicator that shows that the field is required *
  • Make sure that existing events are still working correctly after the update
  • When an existing event is edited and saved a validation message should be displayed to require the end date value if not available.

Issue tracker

  • https://www.drupal.org/project/social/issues/3443501
  • https://getopensocial.atlassian.net/browse/PROD-25979

Theme issue tracker

How to test

  1. Use the open social_event_addtocal module
  2. Try to create a new event without the end date filled in
  3. Try to create a new event with the end date filled in

Definition of done

Before merge

  • [ ] Code/peer review is completed
  • [ ] All commit messages are clear and clean. If applicable a rebase was performed
  • [ ] All automated tests are green
  • [ ] Functional/manual tests of the acceptance criteria are approved
  • [ ] All acceptance criteria were met
  • [ ] New features or changes to existing features are covered by tests, either unit (preferably) or behat
  • [ ] Update path is tested. New hook_updates should respect update order, right naming convention and consider hook_post_update code
  • [ ] Module can be safely uninstalled. Update/implement hook_uninstall and make sure that removed configuration or dependencies are removed/uninstalled
  • [ ] This pull request has all required labels (team/type/priority)
  • [ ] This pull request has a milestone
  • [ ] This pull request has an assignee (if applicable)
  • [ ] Any front end changes are tested on all major browsers
  • [ ] New UI elements, or changes on UI elements are approved by the design team
  • [ ] New features, or feature changes are approved by the product owner

After merge

  • [ ] Code is tested on all branches that it has been cherry-picked
  • [ ] Update hook number might need adjustment, make sure they have the correct order
  • [ ] The Drupal.org ticket(s) are updated according to this pull request status

Screenshots

Release notes

Make the end date of the event required to avoid issues in Calendar block, custom content lists, overviews and more.

Change Record

Translations

Macsym2018 avatar Apr 25 '24 14:04 Macsym2018

Just adding here, want to make sure we get the impact tested correctly before merging this and additionally I think we need to explain the value better. This is quite the impactful decision, but we're really vague on the release notes and the issues encountered, can we make it more explicit and explain where and what value this gives?

ronaldtebrake avatar May 08 '24 15:05 ronaldtebrake

For my own insights I manually reverted the changes to Given, When, and Then, into And. I found that even though the changes in this PR looks like a lot of test changes, the actual changes actually aren't that many :) I've pasted the resulting diff below (ignoring the tag clean-up) in case we want to use it to find some of the original test structure when breaking the tests up into individual scenario's in the future.

I think a good take-away that we need to make some improvements to the developer experience here :) The Behat linting works well for new tests to guide the developer to write focused scenarios. However since we're not there with all of the tests it can cause developers to make a lot of unrelated changes in the tests. This makes it harder to spot the changes the PR is actually about and can also make it more difficult when we do get around to cleaning up the old tests. I'll pick this up with the developer leads to see how we can improve our process.

Sorry this learning happened on your PR Maksym, but thanks for helping us gain new insights into how we can improve our codebase and hopefully make future PRs easier 🙏

Diff
diff --git a/tests/behat/features/capabilities/administration/check-export-users-to-csv.feature b/tests/behat/features/capabilities/administration/check-export-users-to-csv.feature
index 141ad914a..5ec21c97a 100644
--- a/tests/behat/features/capabilities/administration/check-export-users-to-csv.feature
+++ b/tests/behat/features/capabilities/administration/check-export-users-to-csv.feature
@@ -17,7 +17,7 @@ Feature: Export users
     And I disable module social_private_message and its dependants
     And I disable module social_profile_organization_tag and its dependants
 
-    And topics:
+    Given topics:
       | title        | author        | field_topic_type | body                   | field_content_visibility | langcode |
       | Topic content 1| ExportUser1 | News             | Body description text 1| public                   | en       |
       | Topic content 2| ExportUser2 | News             | Body description text 2| public                   | en       |
@@ -27,8 +27,8 @@ Feature: Export users
     And "1" comments with text "Behat Comment [id]" for "Topic content 2"
     And "1" comments with text "Behat Comment [id]" for "Topic content 3"
 
-    And events:
-      | title          | author      | field_event_date    | field_event_date_end | body                   | field_content_visibility | langcode |
+    Given events:
+      | title          | author      | field_event_date    | field_event_end_date | body                   | field_content_visibility | langcode |
       | Event content 1| ExportUser1 | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | Body description text 1| public                   | en       |
       | Event content 2| ExportUser2 | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | Body description text 2| public                   | en       |
       | Event content 3| ExportUser3 | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | Body description text 3| public                   | en       |
@@ -43,13 +43,13 @@ Feature: Export users
       | title           | bundle       | author      |
       | Event content 1 | event        | ExportUser1 |
 
-    And posts:
+    Given posts:
       | field_post    | author      | type | status | field_visibility | langcode |
       | Post content 1| ExportUser1 | post | 1      | 0                | en       |
       | Post content 2| ExportUser2 | post | 1      | 0                | en       |
       | Post content 3| ExportUser3 | post | 1      | 0                | en       |
 
-    And groups:
+    Given groups:
       | label        | author      | field_group_description  | type           | langcode | field_flexible_group_visibility |
       | Test group 1 | ExportUser3 | Group description        | flexible_group | en       | public                          |
 
@@ -154,7 +154,7 @@ Feature: Export users
     # Needed while Social Profile Fields exists
     Given I set the configuration item "social_profile_fields.settings" with key "profile_profile_field_profile_nick_name" to 1
     # Enable all the profile fields
-    And I set the configuration item "field.field.profile.profile.field_profile_address" with key "status" to 1
+    Given I set the configuration item "field.field.profile.profile.field_profile_address" with key "status" to 1
     And I set the configuration item "field.field.profile.profile.field_profile_first_name" with key "status" to 1
     And I set the configuration item "field.field.profile.profile.field_profile_last_name" with key "status" to 1
     And I set the configuration item "field.field.profile.profile.field_profile_nick_name" with key "status" to 1
diff --git a/tests/behat/features/capabilities/event/eventenrollment-manage.feature b/tests/behat/features/capabilities/event/eventenrollment-manage.feature
index 1be0641db..d4cf6a12c 100644
--- a/tests/behat/features/capabilities/event/eventenrollment-manage.feature
+++ b/tests/behat/features/capabilities/event/eventenrollment-manage.feature
@@ -9,8 +9,8 @@ Feature: Manage event enrollment
 
   Scenario: Can't manage an event by default
     Given events with non-anonymous author:
-      | title        | body                  | field_content_visibility | field_event_date    | field_event_date_end    | langcode |
-      | Test content | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00 | en       |
+      | title        | body                  | field_content_visibility | field_event_date    | field_event_end_date | langcode |
+      | Test content | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am logged in as a user with the verified role
 
     When I am viewing the event "Test content"
@@ -22,7 +22,7 @@ Feature: Manage event enrollment
     # authors yet, we have solved this for groups but not yet for topics/events.
     Given I am logged in as a user with the verified role
     And events authored by current user:
-      | title        | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | title        | body                  | field_content_visibility | field_event_date    | field_event_end_date | langcode |
       | Test content | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And users:
       | name     | pass            | mail                        | status | roles        |
@@ -40,8 +40,8 @@ Feature: Manage event enrollment
 
   Scenario: Event manager can see the manage enrollments link on events
     Given events with non-anonymous author:
-      | title        | body                  | field_content_visibility | field_event_date    | field_event_date_end    | langcode |
-      | Test content | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00 | en       |
+      | title        | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am logged in as a user with the verified role
     And I am an event manager for the "Test content" event
 
diff --git a/tests/behat/features/capabilities/event/eventenrollment.feature b/tests/behat/features/capabilities/event/eventenrollment.feature
index d7618d6d0..cdb7b34a9 100644
--- a/tests/behat/features/capabilities/event/eventenrollment.feature
+++ b/tests/behat/features/capabilities/event/eventenrollment.feature
@@ -7,40 +7,38 @@ Feature: Enroll for an event
   @verified @critical
   Scenario: Successfully enroll for an event
     Given I am logged in as an "verified"
-    And I am viewing my event:
+    Given I am viewing my event:
       | title                    | My Behat Event created |
       | field_event_date         | +8 days                |
       | field_event_date_end     | +9 days                |
       | status                   | 1                      |
       | field_content_visibility | community              |
 
-    And I should see "No one has enrolled for this event"
+    Then I should see "No one has enrolled for this event"
     And I should see the button "Enroll"
     And I should see the link "Manage enrollments"
 
     When I press the "Enroll" button
     And I wait for AJAX to finish
-
     Then I should see the text "Meetup: My Behat Event created" in the "Modal"
     And I should see the link "See who else is going" in the "Modal"
     And I press the "Close" button
     And I should see the button "Enrolled"
 
-    And I reload the page
+    Then I reload the page
     And I should see "1 person has enrolled"
     And I should see the link "All enrollments"
 
-    And I click "All enrollments"
-    And I should see the button "Enrolled"
+    When I click "All enrollments"
+    Then I should see the button "Enrolled"
 
   @AN
   Scenario: Successfully redirect an AN from an event enrollment action
     Given users:
       | name            | pass            | mail                        | status | roles    |
       | eventenrollment | eventenrollment | [email protected] | 1      | verified |
-    And I am logged in as an "verified"
+    Given I am logged in as an "verified"
     And I am on "node/add/event"
-
     When I fill in the following:
       | Title                                  | Enrollment redirect test event |
       | edit-field-event-date-0-value-date     | 2025-01-01                     |
@@ -52,30 +50,33 @@ Feature: Enroll for an event
     And I click the xth "0" element with the css "[for=edit-field-content-visibility-public]"
     And I press "Create event"
     And I logout
-    And I open the "event" node with title "Enrollment redirect test event"
-    And I should see "Enrollment redirect test event"
-    And I press the "Enroll" button
+    Given I open the "event" node with title "Enrollment redirect test event"
+    Then I should see "Enrollment redirect test event"
+
+    When I press the "Enroll" button
     And I wait for AJAX to finish
-    And I should see "Please log in or create a new account so that you can enroll to the event"
+    Then I should see "Please log in or create a new account so that you can enroll to the event"
     And I should see "Log in"
-    And I fill in "eventenrollment" for "Username or email address"
+
+    When I fill in "eventenrollment" for "Username or email address"
     And I fill in "eventenrollment" for "Password"
     And I press "Log in"
-    And I should see "Enrollment redirect test event"
-    And I press the "Enroll" button
+    Then I should see "Enrollment redirect test event"
+
+    When I press the "Enroll" button
     And I wait for AJAX to finish
-    And I should see the text "Meetup: Enrollment redirect test event" in the "Modal"
+    Then I should see the text "Meetup: Enrollment redirect test event" in the "Modal"
     And I should see the link "See who else is going" in the "Modal"
     And I press the "Close" button
     And I should see the button "Enrolled"
-    And I reload the page
+
+    Then I reload the page
     And I should see "1 person has enrolled"
     And I should see the link "All enrollments"
 
   @verified
   Scenario: Successfully cancel enrollment for an event
     Given I am logged in as an "verified"
-
     When I am viewing my event:
       | title                    | My Behat Event created |
       | field_event_date         | +8 days                |
@@ -86,28 +87,31 @@ Feature: Enroll for an event
     Then I should see "No one has enrolled for this event"
     And I should see the button "Enroll"
     And I should see the link "Manage enrollments"
-    And I press the "Enroll" button
+
+    When I press the "Enroll" button
     And I wait for AJAX to finish
-    And I should see the text "Meetup: My Behat Event created" in the "Modal"
+    Then I should see the text "Meetup: My Behat Event created" in the "Modal"
     And I should see the link "See who else is going" in the "Modal"
     And I press the "Close" button
     And I should see the button "Enrolled"
-    And I reload the page
+    Then I reload the page
     And I should see "1 person has enrolled"
     And I should see the link "All enrollments"
-    And I press the "Enrolled" button
+
+    When I press the "Enrolled" button
     And I press "Cancel enrollment"
     And I wait for AJAX to finish
     And I reload the page
-    And I should see "No one has enrolled for this event"
+    Then I should see "No one has enrolled for this event"
     And I should see the button "Enroll"
     And I should see the link "Manage enrollments"
+
     # Enroll again, since this is technically something different.
-    And I press the "Enroll" button
+    When I press the "Enroll" button
     And I wait for AJAX to finish
     And I press the "Close" button
     And I reload the page
-    And I should see "1 person has enrolled"
+    Then I should see "1 person has enrolled"
     And I should see the link "All enrollments"
 
   @verified @cache
@@ -115,7 +119,6 @@ Feature: Enroll for an event
     Given users:
       | name            | pass            | mail                        | status | roles    |
       | eventenrollment | eventenrollment | [email protected] | 1      | verified |
-
     When I am logged in as "eventenrollment"
     And I am viewing my event:
       | title            | Enrollment test event |
@@ -123,21 +126,20 @@ Feature: Enroll for an event
       | status           | 1                     |
     And I click "eventenrollment" in the "Main content"
     And I click "Events"
-
     Then I should not see "Enrolled"
-    And I click "Enrollment test event"
+
+    When I click "Enrollment test event"
     And I press the "Enroll" button
     And I wait for AJAX to finish
     And I press the "Close" button
-    And I should see the button "Enrolled"
+    Then I should see the button "Enrolled"
     And I click "eventenrollment" in the "Main content"
     And I click "Events"
-    And I should see "Enrolled"
+    Then I should see "Enrolled"
 
   @closed_enrollments
   Scenario: Can no longer enroll to an event when it has finished.
     Given I am logged in as an "verified"
-
     When I am viewing my event:
       | title                    | My Behat Event created |
       | field_event_date         | -1 days                |
@@ -147,20 +149,20 @@ Feature: Enroll for an event
     Then I should see "No one has enrolled for this event"
     And I should see the button "Event has passed"
     And I should see the link "Manage enrollments"
-    And I am viewing my event:
+    When I am viewing my event:
       | title                    | My Behat Event created |
       | field_event_date         | -3 days                |
       | field_event_date_end     | -2 days                |
       | status                   | 1                      |
       | field_content_visibility | community              |
 
-    And I should see "No one has enrolled for this event"
+    Then I should see "No one has enrolled for this event"
     And I should see the button "Event has passed"
 
   Scenario: Showing the correct total enrollment count.
     Given events with non-anonymous author:
-      | title        | body                  | field_content_visibility | field_event_date    | field_event_date_end    | langcode |
-      | Test content | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00 | en       |
+      | title        | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And there are 13 event enrollments for the "Test content" event
 
     When I am logged in as an "verified"
diff --git a/tests/behat/features/capabilities/groups/flexible/content/view/outsider-anonymous/groups-flexible-content-view-outsider-anonymous.feature b/tests/behat/features/capabilities/groups/flexible/content/view/outsider-anonymous/groups-flexible-content-view-outsider-anonymous.feature
index 06ba0b168..ff22f7271 100644
--- a/tests/behat/features/capabilities/groups/flexible/content/view/outsider-anonymous/groups-flexible-content-view-outsider-anonymous.feature
+++ b/tests/behat/features/capabilities/groups/flexible/content/view/outsider-anonymous/groups-flexible-content-view-outsider-anonymous.feature
@@ -24,7 +24,7 @@ Feature: Flexible groups content view access for anonymous users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | public                          |
     And events with non-anonymous author:
-      | title        | group      | body                  | field_content_visibility | field_event_date | field_event_date_end     | langcode |
+      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
       | Test content | Test group | Body description text | public                   | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am an anonymous user
 
@@ -51,8 +51,8 @@ Feature: Flexible groups content view access for anonymous users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | public                          |
     And events with non-anonymous author:
-      | title        | group      | body                  | field_content_visibility | field_event_date     | field_event_date_end    | langcode |
-      | Test content | Test group | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00     | en       |
+      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Test group | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am an anonymous user
 
     When I am viewing the event "Test content"
@@ -77,8 +77,8 @@ Feature: Flexible groups content view access for anonymous users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | public                          |
     And events with non-anonymous author:
-      | title        | group      | body                  | field_content_visibility | field_event_date     | field_event_date_end   | langcode |
-      | Test content | Test group | Body description text | group                    | 2100-01-01T12:00:00  | 2100-01-01T12:00:00    | en       |
+      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Test group | Body description text | group                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am an anonymous user
 
     When I am viewing the event "Test content"
@@ -157,8 +157,8 @@ Feature: Flexible groups content view access for anonymous users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | community                       |
     And events with non-anonymous author:
-      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end   | langcode |
-      | Test content | Test group | Body description text | group                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00    | en       |
+      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Test group | Body description text | group                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am an anonymous user
 
     When I am viewing the event "Test content"
@@ -184,8 +184,8 @@ Feature: Flexible groups content view access for anonymous users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | members                         |
     And events with non-anonymous author:
-      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end   | langcode |
-      | Test content | Test group | Body description text | public                   | 2100-01-01T12:00:00 | 2100-01-01T12:00:00    | en       |
+      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Test group | Body description text | public                   | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am an anonymous user
 
     When I am viewing the event "Test content"
@@ -211,8 +211,8 @@ Feature: Flexible groups content view access for anonymous users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | members                       |
     And events with non-anonymous author:
-      | title        | group      | body                  | field_content_visibility |field_event_date     | field_event_date_end   | langcode |
-      | Test content | Test group | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00    | en       |
+      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Test group | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am an anonymous user
 
     When I am viewing the event "Test content"
@@ -237,8 +237,8 @@ Feature: Flexible groups content view access for anonymous users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | members                       |
     And events with non-anonymous author:
-      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end   | langcode |
-      | Test content | Test group | Body description text | group                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00    | en       |
+      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Test group | Body description text | group                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am an anonymous user
 
     When I am viewing the event "Test content"
@@ -250,17 +250,17 @@ Feature: Flexible groups content view access for anonymous users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | public                          |
     And events with non-anonymous author:
-      | title                   | group      | body                  | field_content_visibility  | field_event_date    | field_event_date_end   | langcode |
-      | This is public event    | Test group | Body description text | public                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00    | en       |
-      | This is community event | Test group | Body description text | community                 | 2100-01-01T12:00:00 | 2100-01-01T12:00:00    | en       |
-      | This is secret event    | Test group | Body description text | group                     | 2100-01-01T12:00:00 | 2100-01-01T12:00:00    | en       |
+      | title                   | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | This is public event    | Test group | Body description text | public                   | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
+      | This is community event | Test group | Body description text | community                | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
+      | This is secret event    | Test group | Body description text | group                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am an anonymous user
 
     When I am on the event overview
 
     Then I should see "This is public event"
-    And I should not see "This is community event"
-    And I should not see "This is secret event"
+      And I should not see "This is community event"
+      And I should not see "This is secret event"
 
   Scenario: As anonymous user views a group topic on overview page
     Given groups with non-anonymous owner:
@@ -276,5 +276,5 @@ Feature: Flexible groups content view access for anonymous users
     When I am on the topic overview
 
     Then I should see "This is public topic"
-    And I should not see "This is community topic"
-    And I should not see "This is secret topic"
+      And I should not see "This is community topic"
+      And I should not see "This is secret topic"
diff --git a/tests/behat/features/capabilities/groups/flexible/content/view/outsider-authenticated/groups-flexible-content-view-outsider-authenticated.feature b/tests/behat/features/capabilities/groups/flexible/content/view/outsider-authenticated/groups-flexible-content-view-outsider-authenticated.feature
index 462357f50..bfc12adfd 100644
--- a/tests/behat/features/capabilities/groups/flexible/content/view/outsider-authenticated/groups-flexible-content-view-outsider-authenticated.feature
+++ b/tests/behat/features/capabilities/groups/flexible/content/view/outsider-authenticated/groups-flexible-content-view-outsider-authenticated.feature
@@ -261,8 +261,8 @@ Feature: Flexible groups content view access for authenticated users
     When I am on the event overview
 
     Then I should see "This is public event"
-    And I should not see "This is community event"
-    And I should not see "This is secret event"
+      And I should not see "This is community event"
+      And I should not see "This is secret event"
 
   Scenario: As authenticated user views a group topic on overview page
     Given groups with non-anonymous owner:
@@ -278,5 +278,5 @@ Feature: Flexible groups content view access for authenticated users
     When I am on the topic overview
 
     Then I should see "This is public topic"
-    And I should not see "This is community topic"
-    And I should not see "This is secret topic"
+      And I should not see "This is community topic"
+      And I should not see "This is secret topic"
diff --git a/tests/behat/features/capabilities/groups/flexible/content/view/outsider-sitemanager/groups-flexible-content-view-outsider-sitemanager.feature b/tests/behat/features/capabilities/groups/flexible/content/view/outsider-sitemanager/groups-flexible-content-view-outsider-sitemanager.feature
index 69f30c323..f06780e3a 100644
--- a/tests/behat/features/capabilities/groups/flexible/content/view/outsider-sitemanager/groups-flexible-content-view-outsider-sitemanager.feature
+++ b/tests/behat/features/capabilities/groups/flexible/content/view/outsider-sitemanager/groups-flexible-content-view-outsider-sitemanager.feature
@@ -24,8 +24,8 @@ Feature: Flexible groups content view access for sitemanager users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | public                          |
     And events with non-anonymous author:
-      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end    | langcode |
-      | Test content | Test group | Body description text | public                   | 2100-01-01T12:00:00 | 2100-01-01T12:00:00 | en       |
+      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Test group | Body description text | public                   | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am logged in as a user with the sitemanager role
 
     When I am viewing the event "Test content"
diff --git a/tests/behat/features/capabilities/groups/flexible/content/view/outsider-verified/groups-flexible-content-view-outsider-verified.feature b/tests/behat/features/capabilities/groups/flexible/content/view/outsider-verified/groups-flexible-content-view-outsider-verified.feature
index 184e17e56..0833c2115 100644
--- a/tests/behat/features/capabilities/groups/flexible/content/view/outsider-verified/groups-flexible-content-view-outsider-verified.feature
+++ b/tests/behat/features/capabilities/groups/flexible/content/view/outsider-verified/groups-flexible-content-view-outsider-verified.feature
@@ -161,8 +161,8 @@ Feature: Flexible groups content view access for verified users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | community                       |
     And events with non-anonymous author:
-      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end    | langcode |
-      | Test content | Test group | Body description text | group                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00 | en       |
+      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Test group | Body description text | group                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am logged in as a user with the verified role
 
     When I am viewing the event "Test content"
@@ -189,8 +189,8 @@ Feature: Flexible groups content view access for verified users
       | label      | field_group_description | type           | langcode | field_flexible_group_visibility |
       | Test group | Group description       | flexible_group | en       | members                       |
     And events with non-anonymous author:
-      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end    | langcode |
-      | Test content | Test group | Body description text | group                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00 | en       |
+      | title        | group      | body                  | field_content_visibility | field_event_date    | field_event_date_end | langcode |
+      | Test content | Test group | Body description text | group                    | 2100-01-01T12:00:00 | 2100-01-01T12:00:00  | en       |
     And I am logged in as a user with the verified role
 
     When I am viewing the event "Test content"
@@ -211,8 +211,8 @@ Feature: Flexible groups content view access for verified users
     When I am on the event overview
 
     Then I should see "This is public event"
-    And I should see "This is community event"
-    And I should not see "This is secret event"
+      And I should see "This is community event"
+      And I should not see "This is secret event"
 
   Scenario: As verified user views a group topic on overview page
     Given groups with non-anonymous owner:
@@ -228,5 +228,5 @@ Feature: Flexible groups content view access for verified users
     When I am on the topic overview
 
     Then I should see "This is public topic"
-    And I should see "This is community topic"
-    And I should not see "This is secret topic"
+      And I should see "This is community topic"
+      And I should not see "This is secret topic"

Kingdutch avatar May 20 '24 09:05 Kingdutch