diff --git a/spec/forms/admin/settings/experimental_settings_form_spec.rb b/spec/forms/admin/settings/experimental_settings_form_spec.rb index 15b8f1f6616..f7d15394f55 100644 --- a/spec/forms/admin/settings/experimental_settings_form_spec.rb +++ b/spec/forms/admin/settings/experimental_settings_form_spec.rb @@ -37,7 +37,7 @@ RSpec.describe Admin::Settings::ExperimentalSettingsForm, :settings_reset, type: let(:form_arguments) { { url: "/foo", model: false, scope: :settings } } subject(:rendered_form) do - render_form + vc_render_form page end diff --git a/spec/forms/admin/settings/general_settings/welcome_block_form_spec.rb b/spec/forms/admin/settings/general_settings/welcome_block_form_spec.rb index 3b2a9236a18..1f94d773ccf 100644 --- a/spec/forms/admin/settings/general_settings/welcome_block_form_spec.rb +++ b/spec/forms/admin/settings/general_settings/welcome_block_form_spec.rb @@ -36,7 +36,7 @@ RSpec.describe Admin::Settings::GeneralSettings::WelcomeBlockForm, type: :forms let(:form_arguments) { { url: "/foo", model: false, scope: :settings } } subject(:rendered_form) do - render_form + vc_render_form page end diff --git a/spec/forms/admin/settings/general_settings_form_spec.rb b/spec/forms/admin/settings/general_settings_form_spec.rb index 96d38114f83..1ce9f0fe102 100644 --- a/spec/forms/admin/settings/general_settings_form_spec.rb +++ b/spec/forms/admin/settings/general_settings_form_spec.rb @@ -36,7 +36,7 @@ RSpec.describe Admin::Settings::GeneralSettingsForm, type: :forms do let(:form_arguments) { { url: "/foo", model: false, scope: :settings } } subject(:rendered_form) do - render_form + vc_render_form page end diff --git a/spec/forms/admin/settings/languages_settings_form_spec.rb b/spec/forms/admin/settings/languages_settings_form_spec.rb index 381d8bb3be1..e9ff78a0bd8 100644 --- a/spec/forms/admin/settings/languages_settings_form_spec.rb +++ b/spec/forms/admin/settings/languages_settings_form_spec.rb @@ -36,7 +36,7 @@ RSpec.describe Admin::Settings::LanguagesSettingsForm, type: :forms do let(:form_arguments) { { url: "/foo", model: false, scope: :settings } } subject(:rendered_form) do - render_form + vc_render_form page end diff --git a/spec/forms/admin/settings/repositories_settings/checkout_form_spec.rb b/spec/forms/admin/settings/repositories_settings/checkout_form_spec.rb index a0b08950cec..97136a9a9ff 100644 --- a/spec/forms/admin/settings/repositories_settings/checkout_form_spec.rb +++ b/spec/forms/admin/settings/repositories_settings/checkout_form_spec.rb @@ -36,7 +36,7 @@ RSpec.describe Admin::Settings::RepositoriesSettings::CheckoutForm, type: :forms let(:form_arguments) { { url: "/foo", model: false, scope: :settings } } let(:vendor) { :git } - def render_form + def vc_render_form render_in_view_context(described_class, form_arguments, vendor) do |described_class, form_arguments, vendor| primer_form_with(**form_arguments) do |f| f.fields_for(:repository_checkout_data) do |fo| @@ -49,7 +49,7 @@ RSpec.describe Admin::Settings::RepositoriesSettings::CheckoutForm, type: :forms end subject(:rendered_form) do - render_form + vc_render_form page end diff --git a/spec/forms/admin/settings/repositories_settings/commit_messages_form_spec.rb b/spec/forms/admin/settings/repositories_settings/commit_messages_form_spec.rb index dbc2064eaa8..f0850747cf4 100644 --- a/spec/forms/admin/settings/repositories_settings/commit_messages_form_spec.rb +++ b/spec/forms/admin/settings/repositories_settings/commit_messages_form_spec.rb @@ -50,7 +50,7 @@ RSpec.describe Admin::Settings::RepositoriesSettings::CommitMessagesForm, type: end subject(:rendered_form) do - render_form + vc_render_form page end diff --git a/spec/forms/admin/settings/repositories_settings_form_spec.rb b/spec/forms/admin/settings/repositories_settings_form_spec.rb index a3f958fd112..ab543d42295 100644 --- a/spec/forms/admin/settings/repositories_settings_form_spec.rb +++ b/spec/forms/admin/settings/repositories_settings_form_spec.rb @@ -36,7 +36,7 @@ RSpec.describe Admin::Settings::RepositoriesSettingsForm, type: :forms do let(:form_arguments) { { url: "/foo", model: false, scope: :settings } } subject(:rendered_form) do - render_form + vc_render_form page end diff --git a/spec/forms/admin/settings/save_spec.rb b/spec/forms/admin/settings/save_spec.rb index 189004a33ff..6cb4fc24826 100644 --- a/spec/forms/admin/settings/save_spec.rb +++ b/spec/forms/admin/settings/save_spec.rb @@ -36,7 +36,7 @@ RSpec.describe Admin::Settings::Save, type: :forms do let(:form_arguments) { { url: "/foo", model: false, scope: :settings } } subject(:rendered_form) do - render_form + vc_render_form page end diff --git a/spec/forms/settings/input_methods_check_box_group_spec.rb b/spec/forms/settings/input_methods_check_box_group_spec.rb index d4c05063387..3cc909eaef5 100644 --- a/spec/forms/settings/input_methods_check_box_group_spec.rb +++ b/spec/forms/settings/input_methods_check_box_group_spec.rb @@ -131,7 +131,7 @@ RSpec.describe Settings::InputMethods, "#check_box_group", :aggregate_failures, context "without :name param" do subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.check_box_group(label: "Ultimate answer") do |group| group.check_box(label: "Custom label", value: "Custom value") end @@ -150,7 +150,7 @@ RSpec.describe Settings::InputMethods, "#check_box_group", :aggregate_failures, context "with :name param and a block argument" do subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.check_box_group(name: :ultimate_answer, **params) do |group| group.check_box(label: "Custom label", value: "Custom value") end @@ -178,7 +178,7 @@ RSpec.describe Settings::InputMethods, "#check_box_group", :aggregate_failures, context "with :name param and without a block argument" do subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.check_box_group(name: :ultimate_answer, **params) end diff --git a/spec/forms/settings/input_methods_check_box_spec.rb b/spec/forms/settings/input_methods_check_box_spec.rb index 3490b76d725..e62da681cb5 100644 --- a/spec/forms/settings/input_methods_check_box_spec.rb +++ b/spec/forms/settings/input_methods_check_box_spec.rb @@ -45,7 +45,7 @@ RSpec.describe Settings::InputMethods, "#check_box", :aggregate_failures, :setti end subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.check_box(name: :ultimate_answer) end diff --git a/spec/forms/settings/input_methods_radio_button_group_spec.rb b/spec/forms/settings/input_methods_radio_button_group_spec.rb index aea5b295049..7d696f6ae59 100644 --- a/spec/forms/settings/input_methods_radio_button_group_spec.rb +++ b/spec/forms/settings/input_methods_radio_button_group_spec.rb @@ -110,7 +110,7 @@ RSpec.describe Settings::InputMethods, "#radio_button_group", :aggregate_failure context "with a block argument" do subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.radio_button_group(name: :ultimate_answer, **params) do |group| group.radio_button(label: "Custom label 1", value: "Custom value 1") group.radio_button(label: "Custom label 2", value: "Custom value 2") @@ -140,7 +140,7 @@ RSpec.describe Settings::InputMethods, "#radio_button_group", :aggregate_failure context "without a block argument" do subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.radio_button_group(name: :ultimate_answer, **params) end diff --git a/spec/forms/settings/input_methods_rich_text_area_spec.rb b/spec/forms/settings/input_methods_rich_text_area_spec.rb index ab851504e41..a6038730609 100644 --- a/spec/forms/settings/input_methods_rich_text_area_spec.rb +++ b/spec/forms/settings/input_methods_rich_text_area_spec.rb @@ -45,7 +45,7 @@ RSpec.describe Settings::InputMethods, "#rich_text_area", :aggregate_failures, : end subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.rich_text_area(name: :ultimate_answer, rich_text_options: {}) end diff --git a/spec/forms/settings/input_methods_select_list_spec.rb b/spec/forms/settings/input_methods_select_list_spec.rb index 02f9feacbf0..35479b75504 100644 --- a/spec/forms/settings/input_methods_select_list_spec.rb +++ b/spec/forms/settings/input_methods_select_list_spec.rb @@ -104,7 +104,7 @@ RSpec.describe Settings::InputMethods, "#select_list", :aggregate_failures, :set context "with a block argument" do subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.select_list(name: :ultimate_answer, **params) do |select| select.option(label: "Custom label", value: "Custom value") end @@ -132,7 +132,7 @@ RSpec.describe Settings::InputMethods, "#select_list", :aggregate_failures, :set context "without a block argument" do subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.select_list(name: :ultimate_answer, **params) end diff --git a/spec/forms/settings/input_methods_text_area_spec.rb b/spec/forms/settings/input_methods_text_area_spec.rb index 76fb49bb3e3..d004de130f6 100644 --- a/spec/forms/settings/input_methods_text_area_spec.rb +++ b/spec/forms/settings/input_methods_text_area_spec.rb @@ -45,7 +45,7 @@ RSpec.describe Settings::InputMethods, "#text_area", :aggregate_failures, :setti end subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.text_area(name: :ultimate_answer) end diff --git a/spec/forms/settings/input_methods_text_field_spec.rb b/spec/forms/settings/input_methods_text_field_spec.rb index 627fcc713e4..13a736254f4 100644 --- a/spec/forms/settings/input_methods_text_field_spec.rb +++ b/spec/forms/settings/input_methods_text_field_spec.rb @@ -45,7 +45,7 @@ RSpec.describe Settings::InputMethods, "#text_field", :aggregate_failures, :sett end subject(:rendered_form) do - render_inline_settings_form do |settings_form| + vc_render_inline_settings_form do |settings_form| settings_form.text_field(name: :ultimate_answer) end diff --git a/spec/support/forms/rendered_custom_field_input_form.rb b/spec/support/forms/rendered_custom_field_input_form.rb index 6030225210a..0b7b89d9fc2 100644 --- a/spec/support/forms/rendered_custom_field_input_form.rb +++ b/spec/support/forms/rendered_custom_field_input_form.rb @@ -28,6 +28,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ RSpec.shared_context "with rendered custom field input form" do + extend DeprecatedAlias include ViewComponent::TestHelpers let(:model) { create(:project) } @@ -42,7 +43,7 @@ RSpec.shared_context "with rendered custom field input form" do described_class.new(builder, custom_field:, object: model) end - def render_form + def vc_render_form render_in_view_context(model, self) do |model, spec_context| primer_form_with(url: "/foo", model:) do |f| render(spec_context.build_form(f)) @@ -50,13 +51,15 @@ RSpec.shared_context "with rendered custom field input form" do end end + deprecated_alias :render_form, :vc_render_form + before do model.custom_field_values = { "#{custom_field.id}": value } if value model.custom_field_values.first.valid? end subject(:rendered_form) do - render_form + vc_render_form page end diff --git a/spec/support/forms/rendered_form.rb b/spec/support/forms/rendered_form.rb index 32e4e55a44d..912d238c59e 100644 --- a/spec/support/forms/rendered_form.rb +++ b/spec/support/forms/rendered_form.rb @@ -28,12 +28,13 @@ # See COPYRIGHT and LICENSE files for more details. #++ RSpec.shared_context "with rendered form" do + extend DeprecatedAlias include ViewComponent::TestHelpers let(:form_arguments) { { url: "/foo", model: } } let(:params) { {} } - def render_form + def vc_render_form render_in_view_context(described_class, form_arguments, params) do |described_class, form_arguments, params| primer_form_with(**form_arguments) do |f| render(described_class.new(f, **params)) @@ -41,7 +42,9 @@ RSpec.shared_context "with rendered form" do end end + deprecated_alias :render_form, :vc_render_form + before do - render_form + vc_render_form end end diff --git a/spec/support/forms/rendered_inline_form.rb b/spec/support/forms/rendered_inline_form.rb index a5b5f6c0cc8..666fa9f72eb 100644 --- a/spec/support/forms/rendered_inline_form.rb +++ b/spec/support/forms/rendered_inline_form.rb @@ -32,7 +32,7 @@ RSpec.shared_context "with rendered inline form" do let(:form_arguments) { { url: "/foo", model: } } - def render_inline_form(&) + def vc_render_inline_form(&) render_in_view_context(form_arguments) do |form_arguments| primer_form_with(**form_arguments) do |f| render_inline_form(f, &) diff --git a/spec/support/forms/rendered_inline_settings_form.rb b/spec/support/forms/rendered_inline_settings_form.rb index c9c4846840d..197910a9a6c 100644 --- a/spec/support/forms/rendered_inline_settings_form.rb +++ b/spec/support/forms/rendered_inline_settings_form.rb @@ -32,7 +32,7 @@ RSpec.shared_context "with rendered inline settings form" do let(:form_arguments) { { url: "/foo", model: false } } - def render_inline_settings_form(&) + def vc_render_inline_settings_form(&) render_in_view_context(form_arguments) do |form_arguments| primer_form_with(**form_arguments) do |f| render_inline_settings_form(f, &)