diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-01-12 11:48:47 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-01-12 11:48:47 -0800 |
commit | 29f39ec8045e159aebb15d583314d8d3d746e345 (patch) | |
tree | ed5f451d48d9847b0ce13ec99824dfb34aab8e26 /spec/functional | |
parent | 8778f46bf800f3cc9b6e4ba2a014cb04e06925c5 (diff) | |
parent | 6610ebd39d19c3b8776d69a56a39c3b496b8b29f (diff) | |
download | chef-29f39ec8045e159aebb15d583314d8d3d746e345.tar.gz |
Merge pull request #4384 from chef/lcg/really-fix-cops
really fix cops
Diffstat (limited to 'spec/functional')
-rw-r--r-- | spec/functional/application_spec.rb | 8 | ||||
-rw-r--r-- | spec/functional/mixin/shell_out_spec.rb | 16 | ||||
-rw-r--r-- | spec/functional/resource/file_spec.rb | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/spec/functional/application_spec.rb b/spec/functional/application_spec.rb index fe656dca60..4d24549696 100644 --- a/spec/functional/application_spec.rb +++ b/spec/functional/application_spec.rb @@ -47,10 +47,10 @@ describe Chef::Application do it "saves built proxy to ENV which shell_out can use" do so = if windows? - shell_out("echo %http_proxy%") - else - shell_out("echo $http_proxy") - end + shell_out("echo %http_proxy%") + else + shell_out("echo $http_proxy") + end expect(so.stdout.chomp).to eq("http://proxy.example.org:8080") end diff --git a/spec/functional/mixin/shell_out_spec.rb b/spec/functional/mixin/shell_out_spec.rb index 35e5b30eae..8f8b54414a 100644 --- a/spec/functional/mixin/shell_out_spec.rb +++ b/spec/functional/mixin/shell_out_spec.rb @@ -24,10 +24,10 @@ describe Chef::Mixin::ShellOut do describe "when environment['LC_ALL'] is not set" do it "should use the default shell_out setting" do cmd = if windows? - shell_out_with_systems_locale('echo %LC_ALL%') - else - shell_out_with_systems_locale('echo $LC_ALL') - end + shell_out_with_systems_locale('echo %LC_ALL%') + else + shell_out_with_systems_locale('echo $LC_ALL') + end expect(cmd.stdout.chomp).to match_environment_variable('LC_ALL') end @@ -36,10 +36,10 @@ describe Chef::Mixin::ShellOut do describe "when environment['LC_ALL'] is set" do it "should use the option's setting" do cmd = if windows? - shell_out_with_systems_locale('echo %LC_ALL%', :environment => {'LC_ALL' => 'POSIX'}) - else - shell_out_with_systems_locale('echo $LC_ALL', :environment => {'LC_ALL' => 'POSIX'}) - end + shell_out_with_systems_locale('echo %LC_ALL%', :environment => {'LC_ALL' => 'POSIX'}) + else + shell_out_with_systems_locale('echo $LC_ALL', :environment => {'LC_ALL' => 'POSIX'}) + end expect(cmd.stdout.chomp).to eq 'POSIX' end diff --git a/spec/functional/resource/file_spec.rb b/spec/functional/resource/file_spec.rb index 9e30e62111..861bc65363 100644 --- a/spec/functional/resource/file_spec.rb +++ b/spec/functional/resource/file_spec.rb @@ -1,6 +1,6 @@ # # Author:: Seth Chisamore (<schisamo@opscode.com>) -# Copyright:: Copyright (c) 2011 Opscode, Inc. +# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -31,11 +31,11 @@ describe Chef::Resource::File do run_context = Chef::RunContext.new(node, {}, events) use_path = if opts[:use_relative_path] - Dir.chdir(Dir.tmpdir) - File.basename(path) - else - path - end + Dir.chdir(Dir.tmpdir) + File.basename(path) + else + path + end Chef::Resource::File.new(use_path, run_context) end |