lib/atp/flow.rb in atp-1.1.2 vs lib/atp/flow.rb in atp-1.1.3
- old
+ new
@@ -253,10 +253,14 @@
end
if b = options.delete(:bin_description)
options[:on_fail] ||= {}
options[:on_fail][:bin_description] = b
end
+ if b = options.delete(:bin_attrs)
+ options[:on_fail] ||= {}
+ options[:on_fail][:bin_attrs] = b
+ end
if b = options.delete(:softbin) || b = options.delete(:sbin) || b = options.delete(:soft_bin)
options[:on_fail] ||= {}
options[:on_fail][:softbin] = b
end
if b = options.delete(:softbin_description) || options.delete(:sbin_description) || options.delete(:soft_bin_description)
@@ -698,10 +702,11 @@
children = []
if options[:bin] || options[:softbin]
fail_opts = { bin: options[:bin], softbin: options[:softbin] }
fail_opts[:bin_description] = options[:bin_description] if options[:bin_description]
fail_opts[:softbin_description] = options[:softbin_description] if options[:softbin_description]
+ fail_opts[:bin_attrs] = options[:bin_attrs] if options[:bin_attrs]
children << set_result(:fail, fail_opts)
end
if options[:set_run_flag] || options[:set_flag]
children << set_flag_node(options[:set_run_flag] || options[:set_flag])
end
@@ -720,10 +725,11 @@
children = []
if options[:bin] || options[:softbin]
pass_opts = { bin: options[:bin], softbin: options[:softbin] }
pass_opts[:bin_description] = options[:bin_description] if options[:bin_description]
pass_opts[:softbin_description] = options[:softbin_description] if options[:softbin_description]
+ pass_opts[:bin_attrs] = options[:bin_attrs] if options[:bin_attrs]
children << set_result(:pass, pass_opts)
end
if options[:set_run_flag] || options[:set_flag]
children << set_flag_node(options[:set_run_flag] || options[:set_flag])
end
@@ -767,9 +773,14 @@
end
if options[:softbin] && options[:softbin_description]
children << n2(:softbin, options[:softbin], options[:softbin_description])
else
children << n1(:softbin, options[:softbin]) if options[:softbin]
+ end
+ if options[:bin_attrs]
+ options[:bin_attrs].each do |key, val|
+ children << n1(key, val)
+ end
end
n(:set_result, children)
end
def number(val)