Skip to content

A platform for community discussion. Free, open, simple.

DEV: Bump checkbox redesign to stable (#40051)

Martin Brennan6c6f1850171d
diff --git a/config/site_settings.yml b/config/site_settings.yml
index bc6e2b0c623..d40096d5bf7 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -4424,7 +4424,7 @@ experimental:
hidden: true
area: "experimental"
upcoming_change:
- status: "alpha"
+ status: "stable"
impact: "feature,all_members"
enable_new_post_reactions_menu:
default: false
diff --git a/plugins/discourse-ai/spec/system/admin_ai_agent_spec.rb b/plugins/discourse-ai/spec/system/admin_ai_agent_spec.rb
index 473732e76d2..3a93b73643d 100644
--- a/plugins/discourse-ai/spec/system/admin_ai_agent_spec.rb
+++ b/plugins/discourse-ai/spec/system/admin_ai_agent_spec.rb
@@ -61,8 +61,8 @@ RSpec.describe "Admin AI agent configuration" do
visit "/admin/plugins/discourse-ai/ai-agents/#{agent_id}/edit"
- expect(page).to have_selector("input[name='toolOptions.Read.read_private']")
- expect(page).not_to have_selector("input[name='toolOptions.Read.got_deleted']")
+ expect(page).to have_selector("input[name='toolOptions.Read.read_private']", visible: :all)
+ expect(page).not_to have_selector("input[name='toolOptions.Read.got_deleted']", visible: :all)
end
it "will not allow deletion or editing of system agents" do
diff --git a/plugins/discourse-ai/spec/system/ai_bot/tool_spec.rb b/plugins/discourse-ai/spec/system/ai_bot/tool_spec.rb
index 2c9d09d9b47..fe802042248 100644
--- a/plugins/discourse-ai/spec/system/ai_bot/tool_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_bot/tool_spec.rb
@@ -42,11 +42,9 @@ describe "AI Tool Management" do
tool_presets = PageObjects::Components::DMenu.new(find(".ai-tool-list-editor__new-button"))
tool_presets.option(".btn[data-option='exchange_rate']").click
- required_toggle_css = "#control-parameters-0-required .form-kit__control-checkbox"
- enum_toggle_css = "#control-parameters-0-isEnum .form-kit__control-checkbox"
-
- expect(page.find(required_toggle_css).checked?).to eq(true)
- expect(page.find(enum_toggle_css).checked?).to eq(false)
+ form = PageObjects::Components::FormKit.new(".ai-tool-editor")
+ expect(form.collection_field("parameters", 0, "required")).to be_checked
+ expect(form.collection_field("parameters", 0, "isEnum")).to be_unchecked
# not allowed to test yet
expect(page).not_to have_button(".ai-tool-editor__test-button")
@@ -61,8 +59,8 @@ describe "AI Tool Management" do
ensure_can_run_test
- expect(page.first(required_toggle_css).checked?).to eq(true)
- expect(page.first(enum_toggle_css).checked?).to eq(false)
+ expect(form.collection_field("parameters", 0, "required")).to be_checked
+ expect(form.collection_field("parameters", 0, "isEnum")).to be_unchecked
visit "/admin/plugins/discourse-ai/ai-agents/new"
diff --git a/plugins/discourse-data-explorer/spec/system/param_input_spec.rb b/plugins/discourse-data-explorer/spec/system/param_input_spec.rb
index 317c071f437..eaeb7d695d7 100644
--- a/plugins/discourse-data-explorer/spec/system/param_input_spec.rb
+++ b/plugins/discourse-data-explorer/spec/system/param_input_spec.rb
@@ -63,7 +63,10 @@ RSpec.describe "Param input" do
DiscourseDataExplorer::Parameter
.create_from_sql(ALL_PARAMS_SQL)
.each do |param|
- expect(page).to have_css(".query-params .param [name=\"#{param.identifier}\"]")
+ expect(page).to have_css(
+ ".query-params .param [name=\"#{param.identifier}\"]",
+ visible: :all,
+ )
# select-kit fields
ignore_fields = %i[user_id post_id topic_id category_id group_id group_list user_list]
@@ -72,6 +75,7 @@ RSpec.describe "Param input" do
expect(page).to have_field(
param.identifier,
with: simple_normalize(param.type, param.default),
+ visible: :all,
)
end
end
diff --git a/spec/system/admin_about_config_area_spec.rb b/spec/system/admin_about_config_area_spec.rb
index d67cab53c90..505a271a79e 100644
--- a/spec/system/admin_about_config_area_spec.rb
+++ b/spec/system/admin_about_config_area_spec.rb
@@ -243,6 +243,7 @@ describe "Admin About Config Area Page" do
config_area.group_listing_section.initial_members_input.fill_in("3")
config_area.group_listing_section.order_input.select("alphabetically")
config_area.group_listing_section.show_description_input.uncheck
+ expect(config_area.group_listing_section.show_description_input.value).to eq(false)
config_area.group_listing_section.submit
expect(config_area.group_listing_section).to have_saved_successfully
diff --git a/spec/system/admin_user_fields_spec.rb b/spec/system/admin_user_fields_spec.rb
index bb5e2c85ff7..0311773a367 100644
--- a/spec/system/admin_user_fields_spec.rb
+++ b/spec/system/admin_user_fields_spec.rb
@@ -25,7 +25,7 @@ describe "Admin User Fields" do
user_fields_page.add_field(name: "Occupation", description: "")
- expect(user_fields_page.form.field(:description)).to have_errors("Required")
+ expect(user_fields_page.form.field("description")).to have_errors("Required")
end
it "makes sure new required fields are editable after signup" do
@@ -39,11 +39,11 @@ describe "Admin User Fields" do
user_fields_page.choose_requirement("for_all_users")
- expect(form).to have_field(editable_label, checked: true, disabled: true)
+ expect(form).to have_field(editable_label, checked: true, disabled: true, visible: :all)
user_fields_page.choose_requirement("optional")
- expect(form).to have_field(editable_label, checked: true, disabled: false)
+ expect(form).to have_field(editable_label, checked: true, disabled: false, visible: :all)
end
it "makes sure fields are available on signup when they have to" do
@@ -57,33 +57,30 @@ describe "Admin User Fields" do
user_fields_page.choose_requirement("for_all_users")
- expect(form).to have_field(show_on_signup_label, checked: true, disabled: true)
+ expect(form).to have_field(show_on_signup_label, checked: true, disabled: true, visible: :all)
user_fields_page.choose_requirement("on_signup")
- expect(form).to have_field(show_on_signup_label, checked: true, disabled: true)
+ expect(form).to have_field(show_on_signup_label, checked: true, disabled: true, visible: :all)
user_fields_page.choose_requirement("optional")
- expect(form).to have_field(show_on_signup_label, checked: true, disabled: false)
+ expect(form).to have_field(show_on_signup_label, checked: true, disabled: false, visible: :all)
user_fields_page.unselect_preference("editable")
- expect(form).to have_field(show_on_signup_label, checked: true, disabled: true)
+ expect(form).to have_field(show_on_signup_label, checked: true, disabled: true, visible: :all)
end
it "requires confirmation when applying required fields retroactively" do
user_fields_page.visit
- user_fields_page.click_add_field
-
- form = page.find(".user-field")
-
- form.find(".user-field-name").fill_in(with: "Favourite Pokémon")
- form.find(".user-field-desc").fill_in(with: "Hint: It's Mudkip")
-
+ user_fields_page.add_field(
+ name: "Favourite Pokémon",
+ description: "Hint: It's Mudkip",
+ save: false,
+ )
user_fields_page.choose_requirement("for_all_users")
-
- form.find(".btn-primary").click
+ user_fields_page.form.submit
expect(page).to have_text(I18n.t("admin_js.admin.user_fields.requirement.confirmation"))
end
diff --git a/spec/system/page_objects/components/form_kit.rb b/spec/system/page_objects/components/form_kit.rb
index 09e6c610f60..ec56100dead 100644
--- a/spec/system/page_objects/components/form_kit.rb
+++ b/spec/system/page_objects/components/form_kit.rb
@@ -44,7 +44,7 @@ module PageObjects
picker = PageObjects::Components::SelectKit.new(tag_chooser_selector)
picker.value
when "checkbox"
- component.find("input[type='checkbox']").checked?
+ component.find("input[type='checkbox']", visible: :all).checked?
when "menu"
component.find(".fk-d-menu__trigger")["data-value"]
when "select"
@@ -60,6 +60,32 @@ module PageObjects
end
end
+ def uncheck
+ if control_type == "checkbox" && SiteSetting.enable_new_checkbox_style
+ return unless value
+
+ component.find(".form-kit__control-checkbox-checkmark").click
+ return
+ end
+
+ within component do
+ uncheck("input[type='checkbox']", visible: :all)
+ end
+ end
+
+ def check
+ if control_type == "checkbox" && SiteSetting.enable_new_checkbox_style
+ return if value
+
+ component.find(".form-kit__control-checkbox-checkmark").click
+ return
+ end
+
+ within component do
+ check("input[type='checkbox']", visible: :all)
+ end
+ end
+
def unchecked?
if control_type != "checkbox"
raise "'unchecked?' is only supported for control type: #{control_type}"
@@ -107,7 +133,11 @@ module PageObjects
def toggle
case control_type
when "checkbox"
- component.find("input[type='checkbox']").click
+ if SiteSetting.enable_new_checkbox_style
+ component.find(".form-kit__control-checkbox-checkmark").click
+ else
+ component.find("input[type='checkbox']").click
+ end
when "password"
component.find(".form-kit__control-password-toggle").click
when "toggle"
@@ -244,6 +274,14 @@ module PageObjects
end
end
+ def collection_field(collection_name, collection_index, field_name)
+ FormKitField.new(
+ find(
+ ".form-kit__field[data-name='#{collection_name}.#{collection_index}.#{field_name}']",
+ ),
+ )
+ end
+
def field(name)
within component do
FormKitField.new(find(".form-kit__field[data-name='#{name}']"))
diff --git a/spec/system/page_objects/pages/admin_user_fields.rb b/spec/system/page_objects/pages/admin_user_fields.rb
index 3de7f7102ba..8ce281c694b 100644
--- a/spec/system/page_objects/pages/admin_user_fields.rb
+++ b/spec/system/page_objects/pages/admin_user_fields.rb
@@ -13,15 +13,11 @@ module PageObjects
end
def choose_requirement(requirement)
- form = page.find(".user-field")
-
- form.choose(I18n.t("admin_js.admin.user_fields.requirement.#{requirement}.title"))
+ form.choose_conditional(requirement)
end
def unselect_preference(preference)
- form = page.find(".user-field")
-
- form.find(".form-kit__control-checkbox[name='#{preference}']:checked").click
+ form.field(preference).uncheck
end
def click_add_field
@@ -32,14 +28,12 @@ module PageObjects
page.find(".admin-user_field-item__edit").click
end
- def add_field(name: nil, description: nil, requirement: nil, preferences: [])
+ def add_field(name: nil, description: nil, requirement: nil, preferences: [], save: true)
click_add_field
- form = page.find(".user-field")
-
- form.find(".user-field-name").fill_in(with: name)
- form.find(".user-field-desc").fill_in(with: description)
- form.find(".save").click
+ form.field("name").fill_in(name)
+ form.field("description").fill_in(description)
+ form.submit if save
end
def has_user_field?(name)