Merge pull request #1661 from opscode/lcg/chef-12-version-bump

bump version to 12.0.0.alpha.0

2 files changed, 1 insertions, 22 deletions

diff --git a/spec/unit/knife/core/bootstrap_context_spec.rb b/spec/unit/knife/core/bootstrap_context_spec.rb
index 9cabc59719..d78b48cad3 100644
--- a/spec/unit/knife/core/bootstrap_context_spec.rb
+++ b/spec/unit/knife/core/bootstrap_context_spec.rb
@@ -194,7 +194,7 @@ EXPECTED
   describe "when a bootstrap_version is not specified" do
     it "should send the latest current to the installer" do
       # Intentionally hard coded in order not to replicate the logic.
-      bootstrap_context.latest_current_chef_version_string.should eq("-v 11")
+      bootstrap_context.latest_current_chef_version_string.should eq("-v #{Chef::VERSION.to_i}")
     end
   end
 end
diff --git a/spec/unit/lwrp_spec.rb b/spec/unit/lwrp_spec.rb
index bffec9cace..9a775f2dff 100644
--- a/spec/unit/lwrp_spec.rb
+++ b/spec/unit/lwrp_spec.rb
@@ -218,27 +218,6 @@ describe "LWRP" do
           expect(child.default_action).to eq(:dont_eat)
         end
       end
-
-      context "when actions are already defined" do
-        let(:child) do
-          Class.new(parent) do
-            actions :eat
-            actions :sleep
-            actions :drink
-          end
-        end
-
-        def raise_if_deprecated!
-          if Chef::VERSION.split('.').first.to_i > 11
-            raise "This test should be removed and the associated code should be removed!"
-          end
-        end
-
-        it "ammends actions when they are already defined" do
-          raise_if_deprecated!
-          expect(child.actions).to eq([:eat, :sleep, :drink])
-        end
-      end
     end
 
   end