Remove deprecated methods and update tests.

This commit is contained in:
Chris Roberts 2016-11-07 18:48:14 -08:00
parent 3c90023152
commit dbbd2d8e36
6 changed files with 0 additions and 46 deletions

View File

@ -64,16 +64,6 @@ module VagrantPlugins
# @return [String] # @return [String]
attr_accessor :installer_download_path attr_accessor :installer_download_path
# @deprecated
def prerelease=(value)
STDOUT.puts <<-EOH
[DEPRECATED] The configuration `chef.prerelease' has been deprecated. Please use
`chef.channel' instead. The default value for channel is "stable", which
includes the latest published versions of the Chef Client. You can choose to use
prerelease versions by setting the channel to "current".
EOH
end
def initialize def initialize
super super

View File

@ -5,15 +5,6 @@ module VagrantPlugins
class Config < Vagrant.plugin("2", :config) class Config < Vagrant.plugin("2", :config)
attr_reader :images attr_reader :images
def version=(value)
STDOUT.puts <<-EOH
[DEPRECATED] The configuration `docker.version' has been deprecated. Docker no
longer allows you to specify the version of Docker you want installed and will
automatically choose the best version for your guest. Please remove this option
from your Vagrantfile.
EOH
end
def initialize def initialize
@images = Set.new @images = Set.new

View File

@ -4,11 +4,6 @@ require "vagrant/util/deep_merge"
module VagrantPlugins module VagrantPlugins
module Salt module Salt
class Config < Vagrant.plugin("2", :config) class Config < Vagrant.plugin("2", :config)
## @deprecated
def config_dir=(value)
puts "salt config_dir is deprecated and will be removed in Vagrant 1.9"
end
## salty-vagrant options ## salty-vagrant options
attr_accessor :minion_config attr_accessor :minion_config
attr_accessor :minion_key attr_accessor :minion_key

View File

@ -63,14 +63,6 @@ describe VagrantPlugins::Chef::Config::Base do
end end
end end
describe "#prerelease" do
it "should not exist in Vagrant 1.9" do
if Vagrant::VERSION >= "1.9"
raise "This option should be removed!"
end
end
end
describe "#version" do describe "#version" do
it "defaults to :latest" do it "defaults to :latest" do
subject.finalize! subject.finalize!

View File

@ -137,12 +137,4 @@ describe VagrantPlugins::DockerProvisioner::Config do
}) })
end end
end end
describe "#version" do
it "is removed in Vagrant 1.9" do
if Vagrant::VERSION >= "1.9"
raise "Remove deprecated option"
end
end
end
end end

View File

@ -16,12 +16,6 @@ describe VagrantPlugins::Salt::Config do
let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) } let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
describe "#config_dir" do
it "is deprecated until Vagrant 1.9" do
raise "Remove the deprecation" if Vagrant::VERSION >= "1.9.0"
end
end
describe "validate" do describe "validate" do
let(:error_key) { "salt provisioner" } let(:error_key) { "salt provisioner" }