Skip to content

Commit ee5e5b6

Browse files
Fix dialog tag control and specs
1 parent 46c992a commit ee5e5b6

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

app/models/service_orchestration/provision_tagging.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module ServiceOrchestration::ProvisionTagging
2-
DIALOG_TAG_KEY_REGEX = /^Array::dialog_tag_(?<sequence>\d*)_(?<option_key>.*)/i
2+
DIALOG_TAG_KEY_REGEX = /^dialog_tag_(?<sequence>\d*)_(?<option_key>.*)/i
33
DIALOG_TAG_VALUE_REGEX = /Classification::(\d*)/
44

55
private

spec/models/dialog_field_tag_control_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ def add_entry(cat, options)
139139
it "automate_output_value with an single value" do
140140
tag = Classification.first
141141
@df.value = tag.id.to_s
142-
expect(@df.automate_output_value).to eq([tag.id.to_s])
142+
expect(@df.automate_output_value).to eq(["#{tag.class.name}::#{tag.id}"])
143143
end
144144

145145
it "automate_output_value with multiple values" do
146146
tags = [Classification.first, Classification.last]
147147
@df.value = tags.collect(&:id).join(",")
148-
expect(@df.automate_output_value).to match_array(tags.collect { |tag| tag.id.to_s })
148+
expect(@df.automate_output_value).to match_array(tags.collect { |tag| "#{tag.class.name}::#{tag.id}" })
149149
end
150150
end
151151
end

spec/models/service_orchestration/provision_tagging_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
let(:service) { FactoryBot.build(:service_orchestration, :miq_request_task => miq_request_task) }
2121
let(:dialog_tag_options) do
2222
{:dialog => {
23-
'Array::dialog_tag_0_env' => 'Classification::1',
24-
'Array::dialog_tag_1_network' => 'Classification::11',
25-
'Array::dialog_tag_2_dept' => 'Classification::21,Classification::22,Classification::23'
23+
'dialog_tag_0_env' => 'Classification::1',
24+
'dialog_tag_1_network' => 'Classification::11',
25+
'dialog_tag_2_dept' => 'Classification::21,Classification::22,Classification::23'
2626
}}
2727
end
2828

0 commit comments

Comments
 (0)