diff --git a/app/api/groups/update_group_require_strengthened.feature b/app/api/groups/update_group_require_strengthened.feature index 290c57f79..8da5f73a1 100644 --- a/app/api/groups/update_group_require_strengthened.feature +++ b/app/api/groups/update_group_require_strengthened.feature @@ -12,7 +12,7 @@ Feature: | @School | | @Teacher | | | | | @Class | @ClassParent | @Student1,@Student2 | | | | | @SubGroup | @Class | @Student3,@Student4 | | | | - And the group @Teacher is a manager of the group @ClassParent and can can manage memberships and the group + And the group @Teacher is a manager of the group @ClassParent and can manage memberships and the group And the time now is "2020-01-01T01:00:00.001Z" When I send a PUT request to "/groups/@Class" with the following body: """ @@ -49,7 +49,7 @@ Feature: | group | parent | members | require_personal_info_access_approval | require_lock_membership_approval_until | require_watch_approval | | @School | | @Teacher | | | | | @Class | @ClassParent | | | | | - And the group @Teacher is a manager of the group @ClassParent and can can manage memberships and the group + And the group @Teacher is a manager of the group @ClassParent and can manage memberships and the group And the server time now is "2020-01-01T01:00:00.001Z" When I send a PUT request to "/groups/@Class" with the following body: """ @@ -90,7 +90,7 @@ Feature: | group | parent | members | require_lock_membership_approval_until | | @School | | @Teacher | | | @Class | @ClassParent | @Student1 | 2020-01-01 12:00:00 | - And the group @Teacher is a manager of the group @ClassParent and can can manage memberships and the group + And the group @Teacher is a manager of the group @ClassParent and can manage memberships and the group When I send a PUT request to "/groups/@Class" with the following body: """ { @@ -115,7 +115,7 @@ Feature: | @Class | @Student4 | join_request | 2020-01-01 00:00:04.000 | | @Class | @Student5 | invitation | 2020-01-01 00:00:05.000 | | @Other | @Student5 | join_request | 2020-01-01 00:00:15.000 | - And the group @Teacher is a manager of the group @ClassParent and can can manage memberships and the group + And the group @Teacher is a manager of the group @ClassParent and can manage memberships and the group When I send a PUT request to "/groups/@Class" with the following body: """ { @@ -150,7 +150,7 @@ Feature: | @Class | @Student4 | join_request | 2020-01-01 00:00:04.000 | | @Class | @Student5 | invitation | 2020-01-01 00:00:05.000 | | @Other | @Student5 | join_request | 2020-01-01 00:00:15.000 | - And the group @Teacher is a manager of the group @ClassParent and can can manage memberships and the group + And the group @Teacher is a manager of the group @ClassParent and can manage memberships and the group And the time now is "2020-01-01T01:00:00.001Z" When I send a PUT request to "/groups/@Class" with the following body: """ @@ -179,7 +179,7 @@ Feature: | @School | | @Teacher | | | @Class | @ClassParent | @Student1,@Student2 | false | | @SubGroup | @Class | @Student3,@Student4 | | - And the group @Teacher is a manager of the group @ClassParent and can can manage memberships and the group + And the group @Teacher is a manager of the group @ClassParent and can manage memberships and the group When I send a PUT request to "/groups/@Class" with the following body: """ { @@ -214,7 +214,7 @@ Feature: | @Class | @Student6 | invitation | 2020-01-01 00:00:06.000 | | @Other | @Student5 | leave_request | 2020-01-01 00:00:15.000 | | @Other | @Student6 | join_request | 2020-01-01 00:00:16.000 | - And the group @Teacher is a manager of the group @ClassParent and can can manage memberships and the group + And the group @Teacher is a manager of the group @ClassParent and can manage memberships and the group When I send a PUT request to "/groups/@Class" with the following body: """ { diff --git a/testhelpers/feature_context.go b/testhelpers/feature_context.go index 66e428822..908987fb3 100644 --- a/testhelpers/feature_context.go +++ b/testhelpers/feature_context.go @@ -55,7 +55,7 @@ func InitializeScenario(s *godog.ScenarioContext) { s.Step(`^the group (@\w+) is a manager of the group (@\w+) and can grant group access`, ctx.GroupIsAManagerOfTheGroupAndCanGrantGroupAccess) s.Step( - `^the group (@\w+) is a manager of the group (@\w+) and can can manage memberships and the group`, + `^the group (@\w+) is a manager of the group (@\w+) and can manage memberships and the group`, ctx.GroupIsAManagerOfTheGroupAndCanManageMembershipsAndGroup, ) @@ -98,7 +98,7 @@ func InitializeScenario(s *godog.ScenarioContext) { s.Step(`^the response should be "([^"]*)"$`, ctx.TheResponseShouldBe) s.Step(`^the response error message should contain "(.*)"$`, ctx.TheResponseErrorMessageShouldContain) - s.Step(`^the response should be a JSON array with (\d+) entr(ies|y)$`, ctx.ItShouldBeAJSONArrayWithEntries) + s.Step(`^the response should be a JSON array with (\d+) entr(?:ies|y)$`, ctx.ItShouldBeAJSONArrayWithEntries) s.Step(`^the response at ([^ ]+) should be "([^"]*)"$`, ctx.TheResponseAtShouldBeTheValue) s.Step("^the response at ([^ ]+) should be:$", ctx.TheResponseAtShouldBe) s.Step("^the response at ([^ ]+) in JSON should be:$", ctx.TheResponseAtInJSONShouldBe)