From 97961d15fab2d6d566bc168b657442c676ec4e95 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 28 Nov 2017 20:57:48 +0100 Subject: [PATCH] Fix regression in nodesetdir Introduced in c0abee8fd9c155ab5b9df9bef07f91152266fda4 --- lib/beaker-rspec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/beaker-rspec/spec_helper.rb b/lib/beaker-rspec/spec_helper.rb index 07a63fd..798fdf6 100644 --- a/lib/beaker-rspec/spec_helper.rb +++ b/lib/beaker-rspec/spec_helper.rb @@ -37,7 +37,7 @@ options = defaults.merge(env_vars) # process options to construct beaker command string - nodesetdir = options[:nodesetdir] || dir.join('spec', 'acceptance', 'nodesets') + nodesetdir = options[:nodesetdir] || File.join('spec', 'acceptance', 'nodesets') nodesetfile = options[:nodesetfile] || File.join(nodesetdir, "#{options[:nodeset]}.yml") fresh_nodes = options[:provision] == 'no' ? '--no-provision' : nil keyfile = options[:keyfile] ? ['--keyfile', options[:keyfile]] : nil