mirror of
https://github.com/opf/openproject.git
synced 2026-06-14 03:30:14 +00:00
Fix naming collision in with *form shared contexts
Prefixes methods with `vc_` - similar to convention used in `ViewComponent::TestHelpers`. See https://github.com/ViewComponent/view_component/blob/main/lib/view_component/test_helpers.rb#L245
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ RSpec.describe Admin::Settings::RepositoriesSettings::CommitMessagesForm, type:
|
||||
end
|
||||
|
||||
subject(:rendered_form) do
|
||||
render_form
|
||||
vc_render_form
|
||||
page
|
||||
end
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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, &)
|
||||
|
||||
@@ -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, &)
|
||||
|
||||
Reference in New Issue
Block a user