summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2017-07-31 08:45:08 +0100
committerGitHub <noreply@github.com>2017-07-31 08:45:08 +0100
commitbd46cb2e010ea6fb3c6e61039079019d6f8b2a09 (patch)
tree52e3aac81d9928a82917f5dae1dc77bc09c47fce
parent66091a5e4fd9f8a8ff335310ee327dc8e6ca1db4 (diff)
parent8e6fa3bbfbce3e3affce1f03e78b644f5fa16b18 (diff)
downloadchef-bd46cb2e010ea6fb3c6e61039079019d6f8b2a09.tar.gz
Merge pull request #6298 from akitada/rubygems-conf-name-typo
Fix typos
-rw-r--r--RELEASE_NOTES.md4
-rw-r--r--spec/unit/provider/package/rubygems_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index bd52f579ed..e22b4d06d4 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -93,9 +93,9 @@ In Chef/Ohai 14 (April 2018) we will remove support for loading Ohai v6 plugins,
## Rubygems provider sources behavior changed.
-The behavior of `gem_package` and `chef_gem` is now to always apply the `Chef::Config[:rubygems_uri]` sources, which may be a
+The behavior of `gem_package` and `chef_gem` is now to always apply the `Chef::Config[:rubygems_url]` sources, which may be a
String uri or an Array of Strings. If additional sources are put on the resource with the `source` property those are added
-to the configured `:rubygems_uri` sources.
+to the configured `:rubygems_url` sources.
This should enable easier setup of rubygems mirrors particularly in "airgapped" environments through the use of the global config
variable. It also means that an admin may force all rubygems.org traffic to an internal mirror, while still being able to
diff --git a/spec/unit/provider/package/rubygems_spec.rb b/spec/unit/provider/package/rubygems_spec.rb
index 9f19e3602f..856f8d460c 100644
--- a/spec/unit/provider/package/rubygems_spec.rb
+++ b/spec/unit/provider/package/rubygems_spec.rb
@@ -539,7 +539,7 @@ describe Chef::Provider::Package::Rubygems do
end
end
- context "when the source is from the rubygems_uri" do
+ context "when the source is from the rubygems_url" do
it "determines the candidate version by querying the remote gem servers" do
Chef::Config[:rubygems_url] = "https://mirror1/"
expect(provider.gem_env).to receive(:candidate_version_from_remote)