diff options
| author | Tim Smith <tsmith@chef.io> | 2018-07-12 20:58:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-12 20:58:41 -0700 |
| commit | 5a8fd729cd3cc89fc07f7fb2ff5b8e2f83045cd9 (patch) | |
| tree | 70560edba078ef332d4e048d7ae7ed23f3877dc5 | |
| parent | 8383ef2c00099179a86a1de18600246bf1c835d5 (diff) | |
| parent | 21c994b321a20bfa541c727a49a71b1a5d1ca9e8 (diff) | |
| download | chef-5a8fd729cd3cc89fc07f7fb2ff5b8e2f83045cd9.tar.gz | |
Merge pull request #7457 from chef/require_the_right_shellout
Remove require mixlib/shellouts where not necessary
| -rw-r--r-- | lib/chef/provider/user/dscl.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/service/windows_spec.rb | 1 | ||||
| -rw-r--r-- | spec/unit/provider/user/aix_spec.rb | 1 | ||||
| -rw-r--r-- | spec/unit/provider/user/dscl_spec.rb | 1 | ||||
| -rw-r--r-- | spec/unit/provider/user/solaris_spec.rb | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/lib/chef/provider/user/dscl.rb b/lib/chef/provider/user/dscl.rb index 9584e20656..a459525bac 100644 --- a/lib/chef/provider/user/dscl.rb +++ b/lib/chef/provider/user/dscl.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "mixlib/shellout" +require "chef/mixin/shell_out" require "chef/provider/user" require "openssl" require "plist" diff --git a/spec/unit/provider/service/windows_spec.rb b/spec/unit/provider/service/windows_spec.rb index dd59089418..1b7f91df76 100644 --- a/spec/unit/provider/service/windows_spec.rb +++ b/spec/unit/provider/service/windows_spec.rb @@ -18,7 +18,6 @@ # require "spec_helper" -require "mixlib/shellout" describe Chef::Provider::Service::Windows, "load_current_resource", :windows_only do include_context "Win32" diff --git a/spec/unit/provider/user/aix_spec.rb b/spec/unit/provider/user/aix_spec.rb index aa62edd878..f8b5b8a324 100644 --- a/spec/unit/provider/user/aix_spec.rb +++ b/spec/unit/provider/user/aix_spec.rb @@ -15,7 +15,6 @@ # limitations under the License. # -require "mixlib/shellout" require "spec_helper" describe Chef::Provider::User::Aix do diff --git a/spec/unit/provider/user/dscl_spec.rb b/spec/unit/provider/user/dscl_spec.rb index 928cf020e8..c93a1eb4a8 100644 --- a/spec/unit/provider/user/dscl_spec.rb +++ b/spec/unit/provider/user/dscl_spec.rb @@ -18,7 +18,6 @@ require "spec_helper" require "ostruct" -require "mixlib/shellout" describe Chef::Provider::User::Dscl do before do diff --git a/spec/unit/provider/user/solaris_spec.rb b/spec/unit/provider/user/solaris_spec.rb index b39e065f48..11c8656a5c 100644 --- a/spec/unit/provider/user/solaris_spec.rb +++ b/spec/unit/provider/user/solaris_spec.rb @@ -20,7 +20,6 @@ # limitations under the License. # -require "mixlib/shellout" require "spec_helper" describe Chef::Provider::User::Solaris do |