chef 10.14.0.beta.3 → 10.14.0.rc.0

data/spec/functional/knife/exec_spec.rb

@@ -21,6 +21,8 @@ require 'tiny_server'
 
 describe Chef::Knife::Exec do
   before(:all) do
+    @original_config = Chef::Config.hash_dup
+
     Thin::Logging.silent = false
 
     @server = TinyServer::Manager.new#(:debug => true)
@@ -32,14 +34,15 @@ describe Chef::Knife::Exec do
     @api = TinyServer::API.instance
     @api.clear
 
-    Chef::Config[:node_name] = false
-    Chef::Config[:client_key] = false
+    Chef::Config[:node_name] = nil
+    Chef::Config[:client_key] = nil
     Chef::Config[:chef_server_url] = 'http://localhost:9000'
 
     $output = StringIO.new
   end
 
   after(:all) do
+    Chef::Config.configuration = @original_config
     @server.stop
   end
 

data/spec/functional/knife/ssh_spec.rb

@@ -22,6 +22,7 @@ require 'tiny_server'
 describe Chef::Knife::Ssh do
 
   before(:all) do
+    @original_config = Chef::Config.hash_dup
     Chef::Knife::Ssh.load_deps
     Thin::Logging.silent = true
     @server = TinyServer::Manager.new
@@ -29,6 +30,7 @@ describe Chef::Knife::Ssh do
   end
 
   after(:all) do
+    Chef::Config.configuration = @original_config
     @server.stop
   end
 
@@ -197,8 +199,8 @@ describe Chef::Knife::Ssh do
     @api = TinyServer::API.instance
     @api.clear
 
-    Chef::Config[:node_name] = false
-    Chef::Config[:client_key] = false
+    Chef::Config[:node_name] = nil
+    Chef::Config[:client_key] = nil
     Chef::Config[:chef_server_url] = 'http://localhost:9000'
 
     @api.get("/search/node?q=*:*&sort=X_CHEF_id_CHEF_X%20asc&start=0&rows=1000", 200) {

data/spec/functional/resource/link_spec.rb

@@ -318,7 +318,7 @@ describe Chef::Resource::Link do
         it 'create errors out' do
           if windows?
             lambda { resource.run_action(:create) }.should raise_error(Errno::EACCES)
-          elsif os_x?
+          elsif os_x? or solaris? or freebsd?
             lambda { resource.run_action(:create) }.should raise_error(Errno::EPERM)
           else
             lambda { resource.run_action(:create) }.should raise_error(Errno::EISDIR)
@@ -473,7 +473,7 @@ describe Chef::Resource::Link do
         it 'errors out' do
           if windows?
             lambda { resource.run_action(:create) }.should raise_error(Errno::EACCES)
-          elsif os_x?
+          elsif os_x? or solaris? or freebsd?
             lambda { resource.run_action(:create) }.should raise_error(Errno::EPERM)
           else
             lambda { resource.run_action(:create) }.should raise_error(Errno::EISDIR)
@@ -525,7 +525,7 @@ describe Chef::Resource::Link do
             resource.run_action(:create)
             File.exists?(target_file).should be_true
             # OS X gets angry about this sort of link.  Bug in OS X, IMO.
-            pending('OS X symlink? and readlink working on hard links to symlinks', :if => os_x?) do
+            pending('OS X/FreeBSD symlink? and readlink working on hard links to symlinks', :if => (os_x? or freebsd?)) do
               symlink?(target_file).should be_true
               readlink(target_file).should == @other_target
             end
@@ -542,7 +542,7 @@ describe Chef::Resource::Link do
         end
         context 'and the link does not yet exist' do
           it 'links to the target file' do
-            pending('OS X fails to create hardlinks to broken symlinks', :if => os_x?) do
+            pending('OS X/FreeBSD fails to create hardlinks to broken symlinks', :if => (os_x? or freebsd?)) do
               resource.run_action(:create)
               # Windows and Unix have different definitions of exists? here, and that's OK.
               if windows?

data/spec/functional/resource/remote_file_spec.rb

@@ -17,12 +17,13 @@
 #
 
 require 'spec_helper'
+require 'tiny_server'
 
 describe Chef::Resource::RemoteFile do
   include_context Chef::Resource::File
 
   let(:file_base) { "remote_file_spec" }
-  let(:source) { 'http://opscode-chef-spec-data.s3.amazonaws.com/integration/remote_file/nyan_cat.png' }
+  let(:source) { 'http://localhost:9000/nyan_cat.png' }
   let(:expected_content) { IO.read(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png')) }
 
   def create_resource
@@ -38,5 +39,20 @@ describe Chef::Resource::RemoteFile do
     create_resource
   end
 
+  before(:all) do
+    Thin::Logging.silent = false
+    @server = TinyServer::Manager.new
+    @server.start
+    @api = TinyServer::API.instance
+    @api.clear
+    @api.get("/nyan_cat.png", 200) {
+      IO.read(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png'))
+    }
+  end
+
+  after(:all) do
+    @server.stop
+  end
+
   it_behaves_like "a file resource"
 end

data/spec/support/platform_helpers.rb

@@ -20,4 +20,12 @@ def os_x?
   !!(RUBY_PLATFORM =~ /darwin/)
 end
 
+def solaris?
+  !!(RUBY_PLATFORM =~ /solaris/)
+end
+
+def freebsd?
+  !!(RUBY_PLATFORM =~ /freebsd/)
+end
+
 DEV_NULL = windows? ? 'NUL' : '/dev/null'

data/spec/support/shared/functional/securable_resource.rb

@@ -87,7 +87,7 @@ shared_examples_for "a securable resource" do
       mode_string = '776'
       resource.mode mode_string
       resource.run_action(:create)
-      pending('Linux does not support lchmod', :if => resource.instance_of?(Chef::Resource::Link) && !os_x?) do
+      pending('Linux does not support lchmod', :if => resource.instance_of?(Chef::Resource::Link) && !os_x? && !freebsd?) do
         (File.lstat(path).mode & 007777).should == (mode_string.oct & 007777)
       end
     end
@@ -96,7 +96,7 @@ shared_examples_for "a securable resource" do
       mode_integer = 0776
       resource.mode mode_integer
       resource.run_action(:create)
-      pending('Linux does not support lchmod', :if => resource.instance_of?(Chef::Resource::Link) && !os_x?) do
+      pending('Linux does not support lchmod', :if => resource.instance_of?(Chef::Resource::Link) && !os_x? && !freebsd?) do
         (File.lstat(path).mode & 007777).should == (mode_integer & 007777)
       end
     end

data/spec/tiny_server.rb

@@ -62,7 +62,7 @@ module TinyServer
     end
 
     def block_until_started
-      20.times do
+      200.times do
         return true if started?
       end
       raise "TinyServer failed to boot :/"
@@ -74,6 +74,10 @@ module TinyServer
     rescue OpenURI::HTTPError
       true
     rescue Errno::ECONNREFUSED => e
+      sleep 0.1
+      # If the host has ":::1 localhost" in its hosts file and if IPv6
+      # is not enabled we can get NetworkUnreachable exception...
+    rescue Errno::ENETUNREACH => e
       sleep 0.1
       false
     end

data/spec/unit/client_spec.rb

@@ -51,6 +51,30 @@ shared_examples_for Chef::Client do
     @client.node = @node
   end
 
+  describe "authentication protocol selection" do
+    after do
+      Chef::Config[:authentication_protocol_version] = "1.0"
+    end
+
+    context "when the node name is <= 90 bytes" do
+      it "does not force the authentication protocol to 1.1" do
+        Chef::Config[:node_name] = ("f" * 90)
+        # ugly that this happens as a side effect of a getter :(
+        @client.node_name
+        Chef::Config[:authentication_protocol_version].should == "1.0"
+      end
+    end
+
+    context "when the node name is > 90 bytes" do
+      it "sets the authentication protocol to version 1.1" do
+        Chef::Config[:node_name] = ("f" * 91)
+        # ugly that this happens as a side effect of a getter :(
+        @client.node_name
+        Chef::Config[:authentication_protocol_version].should == "1.1"
+      end
+    end
+  end
+
   describe "run" do
 
     it "should identify the node and run ohai, then register the client" do

data/spec/unit/environment_spec.rb

@@ -463,4 +463,30 @@ describe Chef::Environment do
 
   end
 
+  describe "api model" do
+    before(:each) do
+      @rest = mock("Chef::REST")
+      Chef::REST.stub!(:new).and_return(@rest)
+      @query = mock("Chef::Search::Query")
+      Chef::Search::Query.stub!(:new).and_return(@query)
+    end
+
+    describe "list" do
+      describe "inflated" do
+        it "should return a hash of environment names and objects" do
+          e1 = mock("Chef::Environment", :name => "one")
+          @query.should_receive(:search).with(:environment).and_yield(e1)
+          r = Chef::Environment.list(true)
+          r["one"].should == e1
+        end
+      end
+
+      it "should return a hash of environment names and urls" do
+        @rest.should_receive(:get_rest).and_return({ "one" => "http://foo" })
+        r = Chef::Environment.list
+        r["one"].should == "http://foo"
+      end
+    end
+  end
+
 end

data/spec/unit/knife/bootstrap_spec.rb

@@ -32,19 +32,31 @@ describe Chef::Knife::Bootstrap do
     @knife.ui.stub!(:stderr).and_return(@stderr)
   end
 
-  it "should load the default bootstrap template" do
-    @knife.load_template.should be_a_kind_of(String)
+  it "should return a name of default bootstrap template" do
+    @knife.find_template.should be_a_kind_of(String)
   end
 
   it "should error if template can not be found" do
     @knife.config[:template_file] = false
     @knife.config[:distro] = 'penultimate'
-    lambda { @knife.load_template }.should raise_error
+    lambda { @knife.find_template }.should raise_error
+  end
+
+  it "should look for templates early in the run" do
+    File.stub(:exists?).and_return(true)
+    @knife.name_args = ['shatner']
+    @knife.stub!(:read_template).and_return("")
+    @knife.stub!(:knife_ssh).and_return(true)
+    @knife_ssh = @knife.knife_ssh
+    @knife.should_receive(:find_template).ordered
+    @knife.should_receive(:knife_ssh).ordered
+    @knife_ssh.should_receive(:run) # rspec appears to keep order per object
+    @knife.run
   end
 
   it "should load the specified template" do
     @knife.config[:distro] = 'fedora13-gems'
-    lambda { @knife.load_template }.should_not raise_error
+    lambda { @knife.find_template }.should_not raise_error
   end
 
   it "should load the specified template from a Ruby gem" do
@@ -53,28 +65,32 @@ describe Chef::Knife::Bootstrap do
     File.stub(:exists?).and_return(true)
     IO.stub(:read).and_return('random content')
     @knife.config[:distro] = 'fake-bootstrap-template'
-    lambda { @knife.load_template }.should_not raise_error
+    lambda { @knife.find_template }.should_not raise_error
   end
 
   it "should return an empty run_list" do
-    template_string = @knife.load_template(@knife.config[:template_file])
+    @knife.instance_variable_set("@template_file", @knife.config[:template_file])
+    template_string = @knife.read_template
     @knife.render_template(template_string).should == '{"run_list":[]}'
   end
 
   it "should have role[base] in the run_list" do
-    template_string = @knife.load_template(@knife.config[:template_file])
+    @knife.instance_variable_set("@template_file", @knife.config[:template_file])
+    template_string = @knife.read_template
     @knife.parse_options(["-r","role[base]"])
     @knife.render_template(template_string).should == '{"run_list":["role[base]"]}'
   end
 
   it "should have role[base] and recipe[cupcakes] in the run_list" do
-    template_string = @knife.load_template(@knife.config[:template_file])
+    @knife.instance_variable_set("@template_file", @knife.config[:template_file])
+    template_string = @knife.read_template
     @knife.parse_options(["-r", "role[base],recipe[cupcakes]"])
     @knife.render_template(template_string).should == '{"run_list":["role[base]","recipe[cupcakes]"]}'
   end
 
   it "should have foo => {bar => baz} in the first_boot" do
-    template_string = @knife.load_template(@knife.config[:template_file])
+    @knife.instance_variable_set("@template_file", @knife.config[:template_file])
+    template_string = @knife.read_template
     @knife.parse_options(["-j", '{"foo":{"bar":"baz"}}'])
     expected_hash = Yajl::Parser.new.parse('{"foo":{"bar":"baz"},"run_list":[]}')
     actual_hash = Yajl::Parser.new.parse(@knife.render_template(template_string))
@@ -83,15 +99,19 @@ describe Chef::Knife::Bootstrap do
 
   it "should create a hint file when told to" do
     @knife.config[:template_file] = File.expand_path(File.join(CHEF_SPEC_DATA, "bootstrap", "test-hints.erb"))
-    template_string = @knife.load_template()
+    @knife.instance_variable_set("@template_file", @knife.config[:template_file])
+    template_string = @knife.read_template
     @knife.parse_options(["--hint", "openstack"])
     @knife.render_template(template_string).should match /\/etc\/chef\/ohai\/hints\/openstack.json/
   end
 
   it "should populate a hint file with JSON when given a file to read" do
+    @knife.stub(:find_template).and_return(true)
     @knife.config[:template_file] = File.expand_path(File.join(CHEF_SPEC_DATA, "bootstrap", "test-hints.erb"))
     ::File.stub!(:read).and_return('{ "foo" : "bar" }')
-    template_string = @knife.load_template()
+    @knife.instance_variable_set("@template_file", @knife.config[:template_file])
+    template_string = @knife.read_template
+    @knife.stub!(:read_template).and_return('{ "foo" : "bar" }')
     @knife.parse_options(["--hint", "openstack=hints/openstack.json"])
     @knife.render_template(template_string).should match /\{\"foo\":\"bar\"\}/
   end
@@ -109,6 +129,7 @@ describe Chef::Knife::Bootstrap do
       @knife.config[:ssh_password]  = "open_sesame"
       Chef::Config[:knife][:ssh_port] = "4001"
       @knife.config[:identity_file] = "~/.ssh/me.rsa"
+      @knife.stub!(:read_template).and_return("")
       @knife_ssh = @knife.knife_ssh
     end
 
@@ -138,6 +159,7 @@ describe Chef::Knife::Bootstrap do
       @knife.name_args = ["foo.example.com"]
       @knife.config[:ssh_user]      = "rooty"
       @knife.config[:identity_file] = "~/.ssh/me.rsa"
+      @knife.stub!(:read_template).and_return("")
       @knife_ssh = @knife.knife_ssh
     end
 
@@ -161,6 +183,7 @@ describe Chef::Knife::Bootstrap do
       @knife.name_args = ["foo.example.com"]
       @knife.config[:ssh_user]      = "rooty"
       @knife.config[:identity_file] = "~/.ssh/me.rsa"
+      @knife.stub!(:read_template).and_return("")
       @knife_ssh = @knife.knife_ssh
       @knife.stub!(:knife_ssh).and_return(@knife_ssh)
     end

data/spec/unit/knife/config_file_selection_spec.rb

@@ -60,7 +60,7 @@ describe Chef::Knife do
   end
   
   it "configure knife from HOME" do
-    home_config = File.expand_path "#{ENV['HOME']}/.chef/knife.rb"
+    home_config = File.expand_path(File.join("#{ENV['HOME']}", "/.chef/knife.rb"))
     File.stub!(:exist?).and_return do | arg |
       [ home_config ].include? arg
     end
@@ -83,7 +83,7 @@ describe Chef::Knife do
     pwd_config = "#{Dir.pwd}/knife.rb"
     upward_dir = File.expand_path "#{Dir.pwd}/.chef"
     upward_config = File.expand_path "#{upward_dir}/knife.rb"
-    home_config = File.expand_path "#{ENV['HOME']}/.chef/knife.rb"
+    home_config = File.expand_path(File.join("#{ENV['HOME']}", "/.chef/knife.rb"))
     configs = [ env_config, pwd_config, upward_config, home_config ]
     File.stub!(:exist?).and_return do | arg |
       configs.include? arg

data/spec/unit/knife/configure_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe Chef::Knife::Configure do
   before do
+    @original_config = Chef::Config.configuration.dup
+
     Chef::Log.logger = Logger.new(StringIO.new)
 
     Chef::Config[:node_name]  = "webmonkey.example.com"
@@ -25,6 +27,10 @@ describe Chef::Knife::Configure do
     Ohai::System.stub!(:new).and_return(@ohai)
   end
 
+  after do
+    Chef::Config.configuration.replace(@original_config)
+  end
+
   it "asks the user for the URL of the chef server" do
     @knife.ask_user_for_config
     @out.string.should match(Regexp.escape('Please enter the chef server URL: [http://foo.example.org:4000]'))

data/spec/unit/knife/cookbook_create_spec.rb

@@ -37,6 +37,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.config = {:cookbook_path => "~/tmp/monkeypants"}
       @knife.stub!(:create_cookbook)
       @knife.stub!(:create_readme)
+      @knife.stub!(:create_changelog)
       @knife.stub!(:create_metadata)
       @knife.run
     end
@@ -46,6 +47,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.config = {:cookbook_path => @dir}
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "YOUR_COMPANY_NAME", "none")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "YOUR_COMPANY_NAME", "YOUR_EMAIL", "none", "md")
       @knife.run
     end
@@ -59,6 +61,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "YOUR_EMAIL", "none", "md")
       @knife.run
     end
@@ -73,6 +76,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
       @knife.run
     end
@@ -88,6 +92,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "apachev2")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "apachev2", "md")
       @knife.run
     end
@@ -103,6 +108,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
       @knife.run
     end
@@ -118,6 +124,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
       @knife.run
     end
@@ -133,6 +140,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "gplv2")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "gplv2", "md")
       @knife.run
     end
@@ -148,6 +156,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "gplv3")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "gplv3", "md")
       @knife.run
     end
@@ -163,6 +172,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "md")
       @knife.run
     end
@@ -179,6 +189,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "rdoc")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "rdoc")
       @knife.run
     end
@@ -195,6 +206,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "mkd")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "mkd")
       @knife.run
     end
@@ -211,6 +223,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "txt")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "txt")
       @knife.run
     end
@@ -227,10 +240,17 @@ describe Chef::Knife::CookbookCreate do
       @knife.name_args=["foobar"]
       @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
       @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "foo")
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
       @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "foo")
       @knife.run
     end
 
+    it "should create a CHANGELOG file" do
+      @dir = Dir.tmpdir
+      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
+      @knife.run
+    end
+
     context "when the cookbooks path is not specified in the config file nor supplied via parameter" do
       before do
         @old_cookbook_path = Chef::Config[:cookbook_path]