summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2018-03-07 17:10:17 +0000
committerGitHub <noreply@github.com>2018-03-07 17:10:17 +0000
commitb430e4b2ac929255dde47146f5ee3c6f1d05d8e3 (patch)
treecfebc4db061d04003629f0030525924f61cf19a9
parent30ee30b9b4806d8dbc81853a019dc99cbe4adfe1 (diff)
parentb48e7e0f955c961e51e2a036157348c628ba4f44 (diff)
downloadchef-b430e4b2ac929255dde47146f5ee3c6f1d05d8e3.tar.gz
Merge pull request #6958 from jasonwbarnett/remove-old-explicit-provider-set
Remove explicit setting of @provider and depend on ProviderResolver
-rw-r--r--lib/chef/resource/remote_file.rb1
-rw-r--r--spec/unit/resource/remote_file_spec.rb2
2 files changed, 0 insertions, 3 deletions
diff --git a/lib/chef/resource/remote_file.rb b/lib/chef/resource/remote_file.rb
index d2c2622524..a320fd8b47 100644
--- a/lib/chef/resource/remote_file.rb
+++ b/lib/chef/resource/remote_file.rb
@@ -37,7 +37,6 @@ class Chef
@use_last_modified = true
@ftp_active_mode = false
@headers = {}
- @provider = Chef::Provider::RemoteFile
end
# source can take any of the following as arguments
diff --git a/spec/unit/resource/remote_file_spec.rb b/spec/unit/resource/remote_file_spec.rb
index 3e9ba1904c..691c55219c 100644
--- a/spec/unit/resource/remote_file_spec.rb
+++ b/spec/unit/resource/remote_file_spec.rb
@@ -31,13 +31,11 @@ describe Chef::Resource::RemoteFile do
it "says its provider is RemoteFile when the source is an absolute URI" do
resource.source("http://www.google.com/robots.txt")
- expect(resource.provider).to eq(Chef::Provider::RemoteFile)
expect(resource.provider_for_action(:create)).to be_kind_of(Chef::Provider::RemoteFile)
end
it "says its provider is RemoteFile when the source is a network share" do
resource.source("\\\\fakey\\fakerton\\fake.txt")
- expect(resource.provider).to eq(Chef::Provider::RemoteFile)
expect(resource.provider_for_action(:create)).to be_kind_of(Chef::Provider::RemoteFile)
end