Skip to content

Commit

Permalink
Merge pull request #1233 from France-ioi/cucumber_can_can
Browse files Browse the repository at this point in the history 
Fix a mistake in a cucumber step name
  • Loading branch information
@zenovich
zenovich authored Jan 6, 2025
2 parents 2cb7a52 + 45f1cb6 commit 05343cc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions app/api/groups/update_group_require_strengthened.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Feature:
| @School | | @Teacher | | | |
| @Class | @ClassParent | @Student1,@Student2 | <old_require_personal_info_access_approval> | <old_require_lock_membership_approval_until> | <old_require_watch_approval> |
| @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:
"""
Expand Down Expand Up @@ -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 | <group_members> | <old_require_personal_info_access_approval> | <old_require_lock_membership_approval_until> | <old_require_watch_approval> |
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:
"""
Expand Down Expand Up @@ -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:
"""
{
Expand All @@ -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:
"""
{
Expand Down Expand Up @@ -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:
"""
Expand Down Expand Up @@ -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:
"""
{
Expand Down Expand Up @@ -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:
"""
{
Expand Down
4 changes: 2 additions & 2 deletions testhelpers/feature_context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 05343cc

Please sign in to comment.