{/row}{/rows}{/}
diff --git a/template/form/control/radio.pug b/template/form/control/radio.pug
index b2d741e437..c66d41f4e5 100644
--- a/template/form/control/radio.pug
+++ b/template/form/control/radio.pug
@@ -1,7 +1,7 @@
|
| {Radio}{rows}{row}
|
| {/row}{/rows}{/}
diff --git a/tests-behat/calendar.feature b/tests-behat/calendar.feature
index 6eade4b27a..be9693f09d 100644
--- a/tests-behat/calendar.feature
+++ b/tests-behat/calendar.feature
@@ -18,8 +18,6 @@ Feature: Calendar
Then I check if input value for "input[name='datetime']" match text "Jun 29, 2020 01:02:00.000001"
When I fill in "datetime" with "Jun 29, 2020 1:2:0"
Then I check if input value for "input[name='datetime']" match text "Jun 29, 2020 01:02"
- # TODO next step is to close flatpickr calendar, flatpickr needs 2x blur with allowInput
- When I fill in "date_action" with "Dec 8, 2050"
When I press button "Clear"
Then I check if input value for "input[name='date_action']" match text ""
When I press button "Save"
diff --git a/tests-behat/checkbox.feature b/tests-behat/checkbox.feature
index 14d038fbd7..0a77618015 100644
--- a/tests-behat/checkbox.feature
+++ b/tests-behat/checkbox.feature
@@ -4,3 +4,9 @@ Feature: Checkbox
Given I am on "form-control/checkbox.php"
When I press button "Save"
Then Toast display should contain text '{ "test": false, "test_checked": true, "also_checked": true }'
+
+ When I click using selector "//div.ui.checkbox[not(self::*.checked)][input[@name='test']]"
+ When I click using selector "//div.ui.checkbox.checked[input[@name='test_checked']]"
+ When I click using selector "//div.ui.checkbox.checked[input[@name='also_checked']]"
+ When I press button "Save"
+ Then Toast display should contain text '{ "test": true, "test_checked": false, "also_checked": false }'
diff --git a/tests-behat/radio.feature b/tests-behat/radio.feature
new file mode 100644
index 0000000000..e876669817
--- /dev/null
+++ b/tests-behat/radio.feature
@@ -0,0 +1,47 @@
+Feature: Radio
+
+ Scenario:
+ Given I am on "form-control/form6.php"
+ When I press button "Save"
+ Then Toast display should contain text '"enum_d": "male", "enum_r": "male"'
+ Then Toast display should contain text '"list_d": "1", "list_r": "1"'
+ Then Toast display should contain text '"int_d": "7", "int_r": "7"'
+ Then Toast display should contain text '"string_d": "M", "string_r": "M"'
+
+ Then I select value "female" in lookup "enum_d"
+ When I click using selector "//div.ui.radio[not(self::*.checked)][input[@name='enum_r'] and label[text()='female']]"
+ Then I select value "female" in lookup "list_d"
+ When I click using selector "//div.ui.radio[not(self::*.checked)][input[@name='list_r'] and label[text()='female']]"
+ When I press button "Save"
+ Then Toast display should contain text '"enum_d": "female", "enum_r": "female"'
+ Then Toast display should contain text '"list_d": "0", "list_r": "0"'
+ Then Toast display should contain text '"int_d": "7", "int_r": "7"'
+ Then Toast display should contain text '"string_d": "M", "string_r": "M"'
+ Then I select value "female" in lookup "int_d"
+ When I click using selector "//div.ui.radio[not(self::*.checked)][input[@name='int_r'] and label[text()='female']]"
+ Then I select value "female" in lookup "string_d"
+ When I click using selector "//div.ui.radio[not(self::*.checked)][input[@name='string_r'] and label[text()='female']]"
+ When I press button "Save"
+ Then Toast display should contain text '"enum_d": "female", "enum_r": "female"'
+ Then Toast display should contain text '"list_d": "0", "list_r": "0"'
+ Then Toast display should contain text '"int_d": "5", "int_r": "5"'
+ Then Toast display should contain text '"string_d": "F", "string_r": "F"'
+
+ Then I select value "" in lookup "enum_d"
+ When I click using selector "//div.ui.radio.checked[input[@name='enum_r']]"
+ Then I select value "" in lookup "list_d"
+ When I click using selector "//div.ui.radio.checked[input[@name='list_r']]"
+ When I press button "Save"
+ Then Toast display should contain text '"enum_d": null, "enum_r": null'
+ Then Toast display should contain text '"list_d": null, "list_r": null'
+ Then Toast display should contain text '"int_d": "5", "int_r": "5"'
+ Then Toast display should contain text '"string_d": "F", "string_r": "F"'
+ Then I select value "" in lookup "int_d"
+ When I click using selector "//div.ui.radio.checked[input[@name='int_r']]"
+ Then I select value "" in lookup "string_d"
+ When I click using selector "//div.ui.radio.checked[input[@name='string_r']]"
+ When I press button "Save"
+ Then Toast display should contain text '"enum_d": null, "enum_r": null'
+ Then Toast display should contain text '"list_d": null, "list_r": null'
+ Then Toast display should contain text '"int_d": null, "int_r": null'
+ Then Toast display should contain text '"string_d": null, "string_r": null'