From dbbd2d8e3626f3e1bcbd9386736ce27ee8fcad6f Mon Sep 17 00:00:00 2001
From: Chris Roberts <code@chrisroberts.org>
Date: Mon, 7 Nov 2016 18:48:14 -0800
Subject: [PATCH] Remove deprecated methods and update tests.

---
 plugins/provisioners/chef/config/base.rb               | 10 ----------
 plugins/provisioners/docker/config.rb                  |  9 ---------
 plugins/provisioners/salt/config.rb                    |  5 -----
 .../unit/plugins/provisioners/chef/config/base_test.rb |  8 --------
 test/unit/plugins/provisioners/docker/config_test.rb   |  8 --------
 test/unit/plugins/provisioners/salt/config_test.rb     |  6 ------
 6 files changed, 46 deletions(-)

diff --git a/plugins/provisioners/chef/config/base.rb b/plugins/provisioners/chef/config/base.rb
index ac5aa7732..9d033ecf4 100644
--- a/plugins/provisioners/chef/config/base.rb
+++ b/plugins/provisioners/chef/config/base.rb
@@ -64,16 +64,6 @@ module VagrantPlugins
         # @return [String]
         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
           super
 
diff --git a/plugins/provisioners/docker/config.rb b/plugins/provisioners/docker/config.rb
index 8e9de55da..44409a41d 100644
--- a/plugins/provisioners/docker/config.rb
+++ b/plugins/provisioners/docker/config.rb
@@ -5,15 +5,6 @@ module VagrantPlugins
     class Config < Vagrant.plugin("2", :config)
       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
         @images = Set.new
 
diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb
index 750ec3579..b42cfb00d 100644
--- a/plugins/provisioners/salt/config.rb
+++ b/plugins/provisioners/salt/config.rb
@@ -4,11 +4,6 @@ require "vagrant/util/deep_merge"
 module VagrantPlugins
   module Salt
     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
       attr_accessor :minion_config
       attr_accessor :minion_key
diff --git a/test/unit/plugins/provisioners/chef/config/base_test.rb b/test/unit/plugins/provisioners/chef/config/base_test.rb
index c5b207565..a12c76295 100644
--- a/test/unit/plugins/provisioners/chef/config/base_test.rb
+++ b/test/unit/plugins/provisioners/chef/config/base_test.rb
@@ -63,14 +63,6 @@ describe VagrantPlugins::Chef::Config::Base do
     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
     it "defaults to :latest" do
       subject.finalize!
diff --git a/test/unit/plugins/provisioners/docker/config_test.rb b/test/unit/plugins/provisioners/docker/config_test.rb
index ba2b6836d..3f3bfb15a 100644
--- a/test/unit/plugins/provisioners/docker/config_test.rb
+++ b/test/unit/plugins/provisioners/docker/config_test.rb
@@ -137,12 +137,4 @@ describe VagrantPlugins::DockerProvisioner::Config do
       })
     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
diff --git a/test/unit/plugins/provisioners/salt/config_test.rb b/test/unit/plugins/provisioners/salt/config_test.rb
index 92e935db0..24bf24796 100644
--- a/test/unit/plugins/provisioners/salt/config_test.rb
+++ b/test/unit/plugins/provisioners/salt/config_test.rb
@@ -16,12 +16,6 @@ describe VagrantPlugins::Salt::Config do
 
   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
     let(:error_key) { "salt provisioner" }