From 49cb00b12ebf7ed56fc5aa23ea08dd2e1d5fdc5d Mon Sep 17 00:00:00 2001 From: Saku Ytti Date: Mon, 3 Dec 2018 09:38:57 +0200 Subject: [PATCH] Fix logic key? would return false/nil if set to such value, causing us to take true branch has_key?("key") will return true, regardless what value key is set, causing us to take key value branch --- lib/oxidized/hook/ciscosparkdiff.rb | 2 +- lib/oxidized/hook/slackdiff.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/oxidized/hook/ciscosparkdiff.rb b/lib/oxidized/hook/ciscosparkdiff.rb index 080cd303f..f620c21c0 100644 --- a/lib/oxidized/hook/ciscosparkdiff.rb +++ b/lib/oxidized/hook/ciscosparkdiff.rb @@ -22,7 +22,7 @@ def run_hook(ctx) room = CiscoSpark::Room.new(id: cfg.space) log "Connected" - if cfg.diff? ? cfg.diff : true + if cfg.has_key?("diff") ? cfg.diff : true gitoutput = ctx.node.output.new diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil title = ctx.node.name.to_s diff --git a/lib/oxidized/hook/slackdiff.rb b/lib/oxidized/hook/slackdiff.rb index 0e6e85848..e2346c233 100644 --- a/lib/oxidized/hook/slackdiff.rb +++ b/lib/oxidized/hook/slackdiff.rb @@ -21,7 +21,7 @@ def run_hook(ctx) client = Slack::Client.new client.auth_test log "Connected" - if cfg.diff? ? cfg.diff : true + if cfg.has_key?("diff") ? cfg.diff : true gitoutput = ctx.node.output.new diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil unless diff == "no diffs"