Revert "Revert "Merge pull request #7907 from tchak/feat-cond-repetitions""
This reverts commit 0d10d36cb0.
# Conflicts:
# app/models/dossier.rb
# app/models/dossier_preloader.rb
This commit is contained in:
Paul Chavard
parent
9b379dcabf
commit
cb5b60ccda
8 changed files with 221 additions and 140 deletions
|
|
@ -1,118 +1,159 @@
|
|||
describe Administrateurs::ConditionsController, type: :controller do
|
||||
include Logic
|
||||
|
||||
let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :integer_number }] * 3) }
|
||||
let(:first_coordinate) { procedure.draft_revision.revision_types_de_champ.first }
|
||||
let(:second_coordinate) { procedure.draft_revision.revision_types_de_champ.first }
|
||||
let(:third_coordinate) { procedure.draft_revision.revision_types_de_champ.first }
|
||||
let(:first_tdc) { procedure.draft_revision.types_de_champ.first }
|
||||
let(:second_tdc) { procedure.draft_revision.types_de_champ.second }
|
||||
let(:third_tdc) { procedure.draft_revision.types_de_champ.third }
|
||||
|
||||
before { sign_in(procedure.administrateurs.first.user) }
|
||||
|
||||
let(:default_params) do
|
||||
{
|
||||
procedure_id: procedure.id,
|
||||
stable_id: third_tdc.stable_id
|
||||
}
|
||||
end
|
||||
context 'without bloc repetition' do
|
||||
let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :integer_number }] * 3) }
|
||||
let(:first_tdc) { procedure.draft_revision.types_de_champ.first }
|
||||
let(:second_tdc) { procedure.draft_revision.types_de_champ.second }
|
||||
let(:third_tdc) { procedure.draft_revision.types_de_champ.third }
|
||||
|
||||
describe '#update' do
|
||||
before { post :update, params: params, format: :turbo_stream }
|
||||
before { sign_in(procedure.administrateurs.first.user) }
|
||||
|
||||
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
||||
|
||||
let(:condition_form) do
|
||||
let(:default_params) do
|
||||
{
|
||||
rows: [
|
||||
{
|
||||
targeted_champ: champ_value(first_tdc.stable_id).to_json,
|
||||
operator_name: Logic::Eq.name,
|
||||
value: '2'
|
||||
}
|
||||
]
|
||||
procedure_id: procedure.id,
|
||||
stable_id: third_tdc.stable_id
|
||||
}
|
||||
end
|
||||
|
||||
it do
|
||||
expect(third_tdc.reload.condition).to eq(ds_eq(champ_value(first_tdc.stable_id), constant(2)))
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||
describe '#update' do
|
||||
before { post :update, params: params, format: :turbo_stream }
|
||||
|
||||
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
||||
|
||||
let(:condition_form) do
|
||||
{
|
||||
rows: [
|
||||
{
|
||||
targeted_champ: champ_value(first_tdc.stable_id).to_json,
|
||||
operator_name: Logic::Eq.name,
|
||||
value: '2'
|
||||
}
|
||||
]
|
||||
}
|
||||
end
|
||||
|
||||
it do
|
||||
expect(third_tdc.reload.condition).to eq(ds_eq(champ_value(first_tdc.stable_id), constant(2)))
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||
end
|
||||
end
|
||||
|
||||
describe '#add_row' do
|
||||
before { post :add_row, params: default_params, format: :turbo_stream }
|
||||
|
||||
it do
|
||||
expect(third_tdc.reload.condition).to eq(empty_operator(empty, empty))
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||
end
|
||||
end
|
||||
|
||||
describe '#delete_row' do
|
||||
before { delete :delete_row, params: params.merge(row_index: 0), format: :turbo_stream }
|
||||
|
||||
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
||||
|
||||
let(:condition_form) do
|
||||
{
|
||||
rows: [
|
||||
{
|
||||
targeted_champ: champ_value(1).to_json,
|
||||
operator_name: Logic::Eq.name,
|
||||
value: '2'
|
||||
}
|
||||
]
|
||||
}
|
||||
end
|
||||
|
||||
it do
|
||||
expect(third_tdc.reload.condition).to eq(nil)
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||
end
|
||||
end
|
||||
|
||||
describe '#destroy' do
|
||||
before do
|
||||
second_tdc.update(condition: empty_operator(empty, empty))
|
||||
delete :destroy, params: default_params, format: :turbo_stream
|
||||
end
|
||||
|
||||
it do
|
||||
expect(third_tdc.reload.condition).to eq(nil)
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||
end
|
||||
end
|
||||
|
||||
describe '#change_targeted_champ' do
|
||||
before do
|
||||
second_tdc.update(condition: empty_operator(empty, empty))
|
||||
patch :change_targeted_champ, params: params, format: :turbo_stream
|
||||
end
|
||||
|
||||
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
||||
|
||||
let(:condition_form) do
|
||||
{
|
||||
rows: [
|
||||
{
|
||||
targeted_champ: champ_value(second_tdc.stable_id).to_json,
|
||||
operator_name: Logic::EmptyOperator.name,
|
||||
value: empty.to_json
|
||||
}
|
||||
]
|
||||
}
|
||||
end
|
||||
|
||||
it do
|
||||
expect(third_tdc.reload.condition).to eq(ds_eq(champ_value(second_tdc.stable_id), constant(0)))
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#add_row' do
|
||||
before { post :add_row, params: default_params, format: :turbo_stream }
|
||||
|
||||
it do
|
||||
expect(third_tdc.reload.condition).to eq(empty_operator(empty, empty))
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||
context 'with a repetiton bloc' do
|
||||
let(:procedure) do
|
||||
create(:procedure, types_de_champ_public: [
|
||||
{ type: :integer_number, libelle: 'top_1' },
|
||||
{
|
||||
type: :repetition,
|
||||
libelle: 'repetition',
|
||||
children: [
|
||||
{ type: :integer_number, libelle: 'child_1' },
|
||||
{ type: :integer_number, libelle: 'child_2' }
|
||||
]
|
||||
}
|
||||
])
|
||||
end
|
||||
end
|
||||
let(:tdcs) { procedure.draft_revision.types_de_champ }
|
||||
let(:top) { tdcs.find_by(libelle: 'top_1') }
|
||||
let(:repetition) { tdcs.find_by(libelle: 'repetition') }
|
||||
let(:child_1) { tdcs.find_by(libelle: 'child_1') }
|
||||
let(:child_2) { tdcs.find_by(libelle: 'child_2') }
|
||||
|
||||
describe '#delete_row' do
|
||||
before { delete :delete_row, params: params.merge(row_index: 0), format: :turbo_stream }
|
||||
|
||||
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
||||
|
||||
let(:condition_form) do
|
||||
let(:default_params) do
|
||||
{
|
||||
rows: [
|
||||
{
|
||||
targeted_champ: champ_value(1).to_json,
|
||||
operator_name: Logic::Eq.name,
|
||||
value: '2'
|
||||
}
|
||||
]
|
||||
procedure_id: procedure.id,
|
||||
stable_id: child_2.stable_id
|
||||
}
|
||||
end
|
||||
|
||||
it do
|
||||
expect(third_tdc.reload.condition).to eq(nil)
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||
end
|
||||
end
|
||||
describe '#add_row' do
|
||||
before do
|
||||
post :add_row, params: default_params, format: :turbo_stream
|
||||
end
|
||||
|
||||
describe '#destroy' do
|
||||
before do
|
||||
second_tdc.update(condition: empty_operator(empty, empty))
|
||||
delete :destroy, params: default_params, format: :turbo_stream
|
||||
end
|
||||
|
||||
it do
|
||||
expect(third_tdc.reload.condition).to eq(nil)
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||
end
|
||||
end
|
||||
|
||||
describe '#change_targeted_champ' do
|
||||
before do
|
||||
second_tdc.update(condition: empty_operator(empty, empty))
|
||||
patch :change_targeted_champ, params: params, format: :turbo_stream
|
||||
end
|
||||
|
||||
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
||||
|
||||
let(:condition_form) do
|
||||
{
|
||||
rows: [
|
||||
{
|
||||
targeted_champ: champ_value(second_tdc.stable_id).to_json,
|
||||
operator_name: Logic::EmptyOperator.name,
|
||||
value: empty.to_json
|
||||
}
|
||||
]
|
||||
}
|
||||
end
|
||||
|
||||
it do
|
||||
expect(third_tdc.reload.condition).to eq(ds_eq(champ_value(second_tdc.stable_id), constant(0)))
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||
it do
|
||||
expect(child_2.reload.condition).to eq(empty_operator(empty, empty))
|
||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(child_2))
|
||||
expect(assigns(:upper_tdcs)).to eq([child_1, top])
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue