0
0
Fork 1
Spiegel von https://github.com/paviliondev/discourse-custom-wizard.git synchronisiert 2024-11-09 20:02:54 +01:00

Merge pull request #100 from paviliondev/step-conditionality-multiple

FIX: allow setting multiple conditions for entering a step
Dieser Commit ist enthalten in:
Angus McLeod 2021-04-23 17:08:55 +10:00 committet von GitHub
Commit 7d38337c84
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
3 geänderte Dateien mit 92 neuen und 16 gelöschten Zeilen

Datei anzeigen

@ -192,11 +192,16 @@ class CustomWizard::Builder
def check_condition(template)
if template['condition'].present?
CustomWizard::Mapper.new(
result = CustomWizard::Mapper.new(
inputs: template['condition'],
user: @wizard.user,
data: @wizard.current_submission
data: @wizard.current_submission,
opts: {
multiple: true
}
).perform
result.any?
else
true
end

Datei anzeigen

@ -130,21 +130,63 @@ describe CustomWizard::Mapper do
end
end
it "validates valid data" do
expect(CustomWizard::Mapper.new(
inputs: inputs['validation'],
data: data,
user: user1
).perform).to eq(true)
end
context "conditional validation" do
it "validates valid data" do
expect(CustomWizard::Mapper.new(
inputs: inputs['validation'],
data: data,
user: user1
).perform).to eq(true)
end
it "does not validate invalid data" do
data["input_2"] = "value 3"
expect(CustomWizard::Mapper.new(
inputs: inputs['validation'],
data: data,
user: user1
).perform).to eq(false)
it "does not validate invalid data" do
data["input_2"] = "value 3"
expect(CustomWizard::Mapper.new(
inputs: inputs['validation'],
data: data,
user: user1
).perform).to eq(false)
end
context "using or condition" do
it "validates the data when all of the conditions are met" do
expect(CustomWizard::Mapper.new(
inputs: inputs['validation_multiple_pairs'],
data: data,
user: user1,
opts: {
multiple: true
}
).perform.any?).to eq(true)
end
it "validates the data when one of the conditions are met" do
custom_data = data.dup
custom_data['input_1'] = 'value 3'
expect(CustomWizard::Mapper.new(
inputs: inputs['validation_multiple_pairs'],
data: custom_data,
user: user1,
opts: {
multiple: true
}
).perform.any?).to eq(true)
end
it "doesn't validate the data when none of the conditions are met" do
custom_data = data.dup
custom_data['input_1'] = 'value 3'
custom_data['input_2'] = 'value 4'
expect(CustomWizard::Mapper.new(
inputs: inputs['validation_multiple_pairs'],
data: custom_data,
user: user1,
opts: {
multiple: true
}
).perform.any?).to eq(false)
end
end
end
it "maps text fields" do

Datei anzeigen

@ -260,5 +260,34 @@
}
]
}
],
"validation_multiple_pairs": [
{
"type": "validation",
"pairs": [
{
"index": 0,
"key": "input_1",
"key_type": "wizard_field",
"value": "value 1",
"value_type": "text",
"connector": "equal"
}
]
},
{
"type": "validation",
"connector": "or",
"pairs": [
{
"index": 0,
"key": "input_2",
"key_type": "wizard_field",
"value": "value 2",
"value_type": "text",
"connector": "equal"
}
]
}
]
}