mirror of
https://github.com/httprunner/httprunner.git
synced 2026-09-09 09:27:26 +08:00
fix: merge options from ma.Options and ma.ActionOptions
This commit is contained in:
@@ -1 +1 @@
|
|||||||
v5.0.0+2412101027
|
v5.0.0+2412101121
|
||||||
|
|||||||
@@ -85,9 +85,9 @@ type MobileAction struct {
|
|||||||
|
|
||||||
func (ma MobileAction) GetOptions() []ActionOption {
|
func (ma MobileAction) GetOptions() []ActionOption {
|
||||||
var actionOptionList []ActionOption
|
var actionOptionList []ActionOption
|
||||||
|
// Notice: merge options from ma.Options and ma.ActionOptions
|
||||||
if ma.Options != nil {
|
if ma.Options != nil {
|
||||||
actionOptionList = append(actionOptionList, ma.Options.Options()...)
|
actionOptionList = append(actionOptionList, ma.Options.Options()...)
|
||||||
return actionOptionList
|
|
||||||
}
|
}
|
||||||
actionOptionList = append(actionOptionList, ma.ActionOptions.Options()...)
|
actionOptionList = append(actionOptionList, ma.ActionOptions.Options()...)
|
||||||
return actionOptionList
|
return actionOptionList
|
||||||
|
|||||||
Reference in New Issue
Block a user