summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-02-08 12:38:13 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-02-08 12:38:13 -0800
commitc6e69783705cfd48bfea0c943dc071964dd21311 (patch)
tree549e4f970b4a277208feadb69ccdda3144fca989
parentbef17839db105640f04d1d4d4b2e217d46df4224 (diff)
parentf20a9b0d06b86bf9bf0a94fbd17878a0caab566a (diff)
downloadchef-c6e69783705cfd48bfea0c943dc071964dd21311.tar.gz
Merge pull request #4539 from chef/lcg/fix-chefstyle
autofixing busted cops on master
-rw-r--r--acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb4
-rw-r--r--acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb b/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb
index f545d7212a..dd0e0e4e34 100644
--- a/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb
+++ b/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb
@@ -1,5 +1,5 @@
-require 'spec_helper'
+require "spec_helper"
gem_path = "/opt/chef/embedded/bin/gem"
white_list = %w{chef-config json rake}
@@ -8,7 +8,7 @@ describe "gem list" do
it "should not have non-whitelisted duplicate gems" do
gems = command("#{gem_path} list").stdout
- duplicate_gems = gems.lines().select { |l| l.include?(',') }.collect { |l| l.split(' ').first }
+ duplicate_gems = gems.lines().select { |l| l.include?(",") }.collect { |l| l.split(" ").first }
puts "Duplicate gems found: #{duplicate_gems}" if duplicate_gems.length > 0
non_whitelisted_duplicates = duplicate_gems.select { |l| !white_list.include?(l) }
diff --git a/acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb b/acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb
index 0970d19749..7189ddb13b 100644
--- a/acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb
+++ b/acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb
@@ -1,6 +1,6 @@
-require 'serverspec'
-require 'pathname'
+require "serverspec"
+require "pathname"
set :backend, :exec
-set :path, '/bin:/usr/local/bin:$PATH'
+set :path, "/bin:/usr/local/bin:$PATH"