chef 12.6.0 → 12.7.2

data/spec/unit/knife/core/cookbook_scm_repo_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,15 +16,15 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/knife/core/cookbook_scm_repo'
+require "spec_helper"
+require "chef/knife/core/cookbook_scm_repo"
 
 describe Chef::Knife::CookbookSCMRepo do
   before do
-    @repo_path = File.join(CHEF_SPEC_DATA, 'cookbooks')
+    @repo_path = File.join(CHEF_SPEC_DATA, "cookbooks")
     @stdout, @stderr, @stdin = StringIO.new, StringIO.new, StringIO.new
     @ui = Chef::Knife::UI.new(@stdout, @stderr, @stdin, {})
-    @cookbook_repo = Chef::Knife::CookbookSCMRepo.new(@repo_path, @ui, :default_branch => 'master')
+    @cookbook_repo = Chef::Knife::CookbookSCMRepo.new(@repo_path, @ui, :default_branch => "master")
 
     @branch_list = Mixlib::ShellOut.new
     @branch_list.stdout.replace(<<-BRANCHES)
@@ -43,13 +43,13 @@ BRANCHES
   end
 
   it "has a default branch" do
-    expect(@cookbook_repo.default_branch).to eq('master')
+    expect(@cookbook_repo.default_branch).to eq("master")
   end
 
   describe "when sanity checking the repo" do
     it "exits when the directory does not exist" do
       expect(::File).to receive(:directory?).with(@repo_path).and_return(false)
-      expect {@cookbook_repo.sanity_check}.to raise_error(SystemExit)
+      expect { @cookbook_repo.sanity_check }.to raise_error(SystemExit)
     end
 
     describe "and the repo dir exists" do
@@ -59,18 +59,18 @@ BRANCHES
 
       it "exits when there is no git repo" do
         allow(::File).to receive(:directory?).with(/.*\.git/).and_return(false)
-        expect {@cookbook_repo.sanity_check}.to raise_error(SystemExit)
+        expect { @cookbook_repo.sanity_check }.to raise_error(SystemExit)
       end
 
       describe "and the repo is a git repo" do
         before do
-          allow(::File).to receive(:directory?).with(File.join(@repo_path, '.git')).and_return(true)
+          allow(::File).to receive(:directory?).with(File.join(@repo_path, ".git")).and_return(true)
         end
 
         it "exits when the default branch doesn't exist" do
-          @nobranches = Mixlib::ShellOut.new.tap {|s|s.stdout.replace "\n"}
-          expect(@cookbook_repo).to receive(:shell_out!).with('git branch --no-color', :cwd => @repo_path).and_return(@nobranches)
-          expect {@cookbook_repo.sanity_check}.to raise_error(SystemExit)
+          @nobranches = Mixlib::ShellOut.new.tap { |s| s.stdout.replace "\n" }
+          expect(@cookbook_repo).to receive(:shell_out!).with("git branch --no-color", :cwd => @repo_path).and_return(@nobranches)
+          expect { @cookbook_repo.sanity_check }.to raise_error(SystemExit)
         end
 
         describe "and the default branch exists" do
@@ -85,14 +85,14 @@ BRANCHES
             @dirty_status.stdout.replace(<<-DIRTY)
  M chef/lib/chef/knife/cookbook_site_vendor.rb
 DIRTY
-            expect(@cookbook_repo).to receive(:shell_out!).with('git status --porcelain', :cwd => @repo_path).and_return(@dirty_status)
-            expect {@cookbook_repo.sanity_check}.to raise_error(SystemExit)
+            expect(@cookbook_repo).to receive(:shell_out!).with("git status --porcelain", :cwd => @repo_path).and_return(@dirty_status)
+            expect { @cookbook_repo.sanity_check }.to raise_error(SystemExit)
           end
 
           describe "and the repo is clean" do
             before do
-              @clean_status = Mixlib::ShellOut.new.tap {|s| s.stdout.replace("\n")}
-              allow(@cookbook_repo).to receive(:shell_out!).with('git status --porcelain', :cwd => @repo_path).and_return(@clean_status)
+              @clean_status = Mixlib::ShellOut.new.tap { |s| s.stdout.replace("\n") }
+              allow(@cookbook_repo).to receive(:shell_out!).with("git status --porcelain", :cwd => @repo_path).and_return(@clean_status)
             end
 
             it "passes the sanity check" do
@@ -106,35 +106,35 @@ DIRTY
   end
 
   it "resets to default state by checking out the default branch" do
-    expect(@cookbook_repo).to receive(:shell_out!).with('git checkout master', :cwd => @repo_path)
+    expect(@cookbook_repo).to receive(:shell_out!).with("git checkout master", :cwd => @repo_path)
     @cookbook_repo.reset_to_default_state
   end
 
   it "determines if a the pristine copy branch exists" do
-    expect(@cookbook_repo).to receive(:shell_out!).with('git branch --no-color', :cwd => @repo_path).and_return(@branch_list)
+    expect(@cookbook_repo).to receive(:shell_out!).with("git branch --no-color", :cwd => @repo_path).and_return(@branch_list)
     expect(@cookbook_repo.branch_exists?("chef-vendor-apache2")).to be_truthy
-    expect(@cookbook_repo).to receive(:shell_out!).with('git branch --no-color', :cwd => @repo_path).and_return(@branch_list)
+    expect(@cookbook_repo).to receive(:shell_out!).with("git branch --no-color", :cwd => @repo_path).and_return(@branch_list)
     expect(@cookbook_repo.branch_exists?("chef-vendor-nginx")).to be_falsey
   end
 
   it "determines if a the branch not exists correctly without substring search" do
-    expect(@cookbook_repo).to receive(:shell_out!).twice.with('git branch --no-color', :cwd => @repo_path).and_return(@branch_list)
+    expect(@cookbook_repo).to receive(:shell_out!).twice.with("git branch --no-color", :cwd => @repo_path).and_return(@branch_list)
     expect(@cookbook_repo).not_to be_branch_exists("chef-vendor-absent")
     expect(@cookbook_repo).to be_branch_exists("chef-vendor-absent-new")
   end
 
   describe "when the pristine copy branch does not exist" do
     it "prepares for import by creating the pristine copy branch" do
-      expect(@cookbook_repo).to receive(:shell_out!).with('git branch --no-color', :cwd => @repo_path).and_return(@branch_list)
-      expect(@cookbook_repo).to receive(:shell_out!).with('git checkout -b chef-vendor-nginx', :cwd => @repo_path)
+      expect(@cookbook_repo).to receive(:shell_out!).with("git branch --no-color", :cwd => @repo_path).and_return(@branch_list)
+      expect(@cookbook_repo).to receive(:shell_out!).with("git checkout -b chef-vendor-nginx", :cwd => @repo_path)
       @cookbook_repo.prepare_to_import("nginx")
     end
   end
 
   describe "when the pristine copy branch does exist" do
     it "prepares for import by checking out the pristine copy branch" do
-      expect(@cookbook_repo).to receive(:shell_out!).with('git branch --no-color', :cwd => @repo_path).and_return(@branch_list)
-      expect(@cookbook_repo).to receive(:shell_out!).with('git checkout chef-vendor-apache2', :cwd => @repo_path)
+      expect(@cookbook_repo).to receive(:shell_out!).with("git branch --no-color", :cwd => @repo_path).and_return(@branch_list)
+      expect(@cookbook_repo).to receive(:shell_out!).with("git checkout chef-vendor-apache2", :cwd => @repo_path)
       @cookbook_repo.prepare_to_import("apache2")
     end
   end
@@ -143,15 +143,15 @@ DIRTY
     before do
       @updates = Mixlib::ShellOut.new
       @updates.stdout.replace("\n")
-      allow(@cookbook_repo).to receive(:shell_out!).with('git status --porcelain -- apache2', :cwd => @repo_path).and_return(@updates)
+      allow(@cookbook_repo).to receive(:shell_out!).with("git status --porcelain -- apache2", :cwd => @repo_path).and_return(@updates)
     end
 
     it "shows no changes in the pristine copy" do
-      expect(@cookbook_repo.updated?('apache2')).to be_falsey
+      expect(@cookbook_repo.updated?("apache2")).to be_falsey
     end
 
     it "does nothing to finalize the updates" do
-      expect(@cookbook_repo.finalize_updates_to('apache2', '1.2.3')).to be_falsey
+      expect(@cookbook_repo.finalize_updates_to("apache2", "1.2.3")).to be_falsey
     end
   end
 
@@ -159,11 +159,11 @@ DIRTY
     before do
       @updates = Mixlib::ShellOut.new
       @updates.stdout.replace(" M cookbooks/apache2/recipes/default.rb\n")
-      allow(@cookbook_repo).to receive(:shell_out!).with('git status --porcelain -- apache2', :cwd => @repo_path).and_return(@updates)
+      allow(@cookbook_repo).to receive(:shell_out!).with("git status --porcelain -- apache2", :cwd => @repo_path).and_return(@updates)
     end
 
     it "shows changes in the pristine copy" do
-      expect(@cookbook_repo.updated?('apache2')).to be_truthy
+      expect(@cookbook_repo.updated?("apache2")).to be_truthy
     end
 
     it "commits the changes to the repo and tags the commit" do
@@ -176,11 +176,11 @@ DIRTY
 
   describe "when a custom default branch is specified" do
     before do
-      @cookbook_repo = Chef::Knife::CookbookSCMRepo.new(@repo_path, @ui, :default_branch => 'develop')
+      @cookbook_repo = Chef::Knife::CookbookSCMRepo.new(@repo_path, @ui, :default_branch => "develop")
     end
 
     it "resets to default state by checking out the default branch" do
-      expect(@cookbook_repo).to receive(:shell_out!).with('git checkout develop', :cwd => @repo_path)
+      expect(@cookbook_repo).to receive(:shell_out!).with("git checkout develop", :cwd => @repo_path)
       @cookbook_repo.reset_to_default_state
     end
   end

data/spec/unit/knife/core/custom_manifest_loader_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software, Inc
+# Copyright:: Copyright 2015-2016, Chef Software, Inc
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Knife::SubcommandLoader::CustomManifestLoader do
   let(:ec2_server_create_plugin) { "/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/ec2_server_create.rb" }
@@ -30,7 +30,7 @@ describe Chef::Knife::SubcommandLoader::CustomManifestLoader do
     }
   end
   let(:loader) do
-    Chef::Knife::SubcommandLoader::CustomManifestLoader.new(File.join(CHEF_SPEC_DATA, 'knife-site-subcommands'),
+    Chef::Knife::SubcommandLoader::CustomManifestLoader.new(File.join(CHEF_SPEC_DATA, "knife-site-subcommands"),
                                                             manifest_content)
   end
 

data/spec/unit/knife/core/gem_glob_loader_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software, Inc
+# Copyright:: Copyright 2015-2016, Chef Software, Inc
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,17 +15,17 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Knife::SubcommandLoader::GemGlobLoader do
-   let(:loader) { Chef::Knife::SubcommandLoader::GemGlobLoader.new(File.join(CHEF_SPEC_DATA, 'knife-site-subcommands')) }
-   let(:home) { File.join(CHEF_SPEC_DATA, 'knife-home') }
-   let(:plugin_dir) { File.join(home, '.chef', 'plugins', 'knife') }
+  let(:loader) { Chef::Knife::SubcommandLoader::GemGlobLoader.new(File.join(CHEF_SPEC_DATA, "knife-site-subcommands")) }
+  let(:home) { File.join(CHEF_SPEC_DATA, "knife-home") }
+  let(:plugin_dir) { File.join(home, ".chef", "plugins", "knife") }
 
-   before do
-     allow(ChefConfig).to receive(:windows?) { false }
-     Chef::Util::PathHelper.class_variable_set(:@@home_dir, home)
-   end
+  before do
+    allow(ChefConfig).to receive(:windows?) { false }
+    Chef::Util::PathHelper.class_variable_set(:@@home_dir, home)
+  end
 
   after do
     Chef::Util::PathHelper.class_variable_set(:@@home_dir, nil)
@@ -39,15 +39,15 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
   end
 
   it "finds files installed via rubygems" do
-    expect(loader.find_subcommands_via_rubygems).to include('chef/knife/node_create')
-    loader.find_subcommands_via_rubygems.each {|rel_path, abs_path| expect(abs_path).to match(%r[chef/knife/.+])}
+    expect(loader.find_subcommands_via_rubygems).to include("chef/knife/node_create")
+    loader.find_subcommands_via_rubygems.each { |rel_path, abs_path| expect(abs_path).to match(%r{chef/knife/.+}) }
   end
 
   it "finds files from latest version of installed gems" do
-    gems = [ double('knife-ec2-0.5.12') ]
+    gems = [ double("knife-ec2-0.5.12") ]
     gem_files = [
-      '/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/ec2_base.rb',
-      '/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/ec2_otherstuff.rb'
+      "/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/ec2_base.rb",
+      "/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/ec2_otherstuff.rb",
     ]
     expect($LOAD_PATH).to receive(:map).and_return([])
     if Gem::Specification.respond_to? :latest_specs
@@ -55,26 +55,26 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
       expect(gems[0]).to receive(:matches_for_glob).with(/chef\/knife\/\*\.rb\{(.*),\.rb,(.*)\}/).and_return(gem_files)
     else
       expect(Gem.source_index).to receive(:latest_specs).with(true).and_return(gems)
-      expect(gems[0]).to receive(:require_paths).twice.and_return(['lib'])
-      expect(gems[0]).to receive(:full_gem_path).and_return('/usr/lib/ruby/gems/knife-ec2-0.5.12')
-      expect(Dir).to receive(:[]).with('/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/*.rb').and_return(gem_files)
+      expect(gems[0]).to receive(:require_paths).twice.and_return(["lib"])
+      expect(gems[0]).to receive(:full_gem_path).and_return("/usr/lib/ruby/gems/knife-ec2-0.5.12")
+      expect(Dir).to receive(:[]).with("/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/*.rb").and_return(gem_files)
     end
     expect(loader).to receive(:find_subcommands_via_dirglob).and_return({})
     expect(loader.subcommand_files.select { |file| file =~ /knife-ec2/ }.sort).to eq(gem_files)
   end
 
   it "finds files using a dirglob when rubygems is not available" do
-    expect(loader.find_subcommands_via_dirglob).to include('chef/knife/node_create')
-    loader.find_subcommands_via_dirglob.each {|rel_path, abs_path| expect(abs_path).to match(%r[chef/knife/.+])}
+    expect(loader.find_subcommands_via_dirglob).to include("chef/knife/node_create")
+    loader.find_subcommands_via_dirglob.each { |rel_path, abs_path| expect(abs_path).to match(%r{chef/knife/.+}) }
   end
 
   it "finds user-specific subcommands in the user's ~/.chef directory" do
-    expected_command = File.join(home, '.chef', 'plugins', 'knife', 'example_home_subcommand.rb')
+    expected_command = File.join(home, ".chef", "plugins", "knife", "example_home_subcommand.rb")
     expect(loader.site_subcommands).to include(expected_command)
   end
 
   it "finds repo specific subcommands by searching for a .chef directory" do
-    expected_command = File.join(CHEF_SPEC_DATA, 'knife-site-subcommands', 'plugins', 'knife', 'example_subcommand.rb')
+    expected_command = File.join(CHEF_SPEC_DATA, "knife-site-subcommands", "plugins", "knife", "example_subcommand.rb")
     expect(loader.site_subcommands).to include(expected_command)
   end
 
@@ -135,7 +135,7 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
         # `SubcommandLoader::MATCHES_CHEF_GEM` should make it clear why we want
         # to test these two cases.
         "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-bar-1.0.0/lib/chef/knife/chef-bar.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/bar-chef-1.0.0/lib/chef/knife/bar-chef.rb"
+        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/bar-chef-1.0.0/lib/chef/knife/bar-chef.rb",
       ]
     end
 
@@ -153,7 +153,7 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
         "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-foo-#{Chef::VERSION}/lib/chef/knife/chef-foo.rb",
         "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/foo-chef-#{Chef::VERSION}/lib/chef/knife/foo-chef.rb",
         "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-bar-1.0.0/lib/chef/knife/chef-bar.rb",
-        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/bar-chef-1.0.0/lib/chef/knife/bar-chef.rb"
+        "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/bar-chef-1.0.0/lib/chef/knife/bar-chef.rb",
       ]
     end
 
@@ -178,7 +178,6 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
       allow(ENV).to receive(:[]).with("HOME").and_return(env_home)
     end
 
-
     it "searches rubygems for plugins" do
       if Gem::Specification.respond_to?(:latest_specs)
         expect(Gem::Specification).to receive(:latest_specs).and_call_original

data/spec/unit/knife/core/hashed_command_loader_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software, Inc
+# Copyright:: Copyright 2015-2016, Chef Software, Inc
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Knife::SubcommandLoader::HashedCommandLoader do
   before do
@@ -27,7 +27,7 @@ describe Chef::Knife::SubcommandLoader::HashedCommandLoader do
       "_autogenerated_command_paths" => {
         "plugins_paths" => {
           "cool_a" => ["/file/for/plugin/a"],
-          "cooler_b" => ["/file/for/plugin/b"]
+          "cooler_b" => ["/file/for/plugin/b"],
         },
         "plugins_by_category" => {
           "cool" => [
@@ -35,23 +35,23 @@ describe Chef::Knife::SubcommandLoader::HashedCommandLoader do
           ],
           "cooler" => [
             "cooler_b"
-          ]
-        }
+          ],
+        },
       }
     }
   }
 
   let(:loader) { Chef::Knife::SubcommandLoader::HashedCommandLoader.new(
-    File.join(CHEF_SPEC_DATA, 'knife-site-subcommands'),
+    File.join(CHEF_SPEC_DATA, "knife-site-subcommands"),
     plugin_manifest)}
 
   describe "#list_commands" do
     it "lists all commands by category when no argument is given" do
-      expect(loader.list_commands).to eq({"cool" => ["cool_a"], "cooler" => ["cooler_b"]})
+      expect(loader.list_commands).to eq({ "cool" => ["cool_a"], "cooler" => ["cooler_b"] })
     end
 
     it "lists only commands in the given category when a category is given" do
-      expect(loader.list_commands("cool")).to eq({"cool" => ["cool_a"]})
+      expect(loader.list_commands("cool")).to eq({ "cool" => ["cool_a"] })
     end
   end
 

data/spec/unit/knife/core/node_editor_spec.rb

@@ -0,0 +1,211 @@
+#
+# Author:: Jordan Running (<jr@chef.io>)
+# Copyright:: Copyright (c) 2016 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "chef/knife/core/node_editor"
+
+describe Chef::Knife::NodeEditor do
+  let(:node_data) do
+    { "name" => "test_node",
+      "chef_environment" => "production",
+      "automatic" => { "foo" => "bar" },
+      "default"   => { "alpha" => { "bravo" => "charlie", "delta" => "echo" } },
+      "normal"    => { "alpha" => { "bravo" => "hotel" }, "tags" => [] },
+      "override"  => { "alpha" => { "bravo" => "foxtrot", "delta" => "golf" } },
+      "policy_name"  => nil,
+      "policy_group" => nil,
+      "run_list" => %w{role[comedy] role[drama] recipe[mystery]},
+    }
+  end
+
+  let(:node) { Chef::Node.from_hash(node_data) }
+
+  let(:ui) { double "ui" }
+  let(:base_config) { { editor: "cat" } }
+  let(:config) { base_config.merge(all_attributes: false) }
+
+  subject { described_class.new(node, ui, config) }
+
+  describe '#view' do
+    it "returns a Hash with only the name, chef_environment, normal, " +
+      "policy_name, policy_group, and run_list properties" do
+      expected = node_data.select do |key,|
+        %w{ name chef_environment normal
+            policy_name policy_group run_list }.include?(key)
+      end
+
+      expect(subject.view).to eq(expected)
+    end
+
+    context "when config[:all_attributes] == true" do
+      let(:config) { base_config.merge(all_attributes: true) }
+
+      it 'returns a Hash with all of the node\'s properties' do
+        expect(subject.view).to eq(node_data)
+      end
+    end
+  end
+
+  describe '#apply_updates' do
+    context "when the node name is changed" do
+      before(:each) do
+        allow(ui).to receive(:warn)
+        allow(ui).to receive(:confirm).and_return(true)
+      end
+
+      it "emits a warning and prompts for confirmation" do
+        data = subject.view.merge("name" => "foo_new_name_node")
+        updated_node = subject.apply_updates(data)
+
+        expect(ui).to have_received(:warn)
+          .with "Changing the name of a node results in a new node being " +
+            "created, test_node will not be modified or removed."
+
+        expect(ui).to have_received(:confirm)
+          .with("Proceed with creation of new node")
+
+        expect(updated_node).to be_a(Chef::Node)
+      end
+    end
+
+    context "when config[:all_attributes] == false" do
+      let(:config) { base_config.merge(all_attributes: false) }
+
+      let(:updated_data) do
+        subject.view.merge(
+          "normal" => { "alpha" => { "bravo" => "hotel2" }, "tags" => [ "xyz" ] },
+          "policy_name" => "mypolicy",
+          "policy_group" => "prod",
+          "run_list" => %w{role[drama] recipe[mystery]},
+        )
+      end
+
+      it "returns a node with run_list and normal_attrs changed" do
+        updated_node = subject.apply_updates(updated_data)
+        expect(updated_node).to be_a(Chef::Node)
+
+        # Expected to have been changed
+        expect(updated_node.chef_environment).to eql(updated_data["chef_environment"])
+        expect(updated_node.normal_attrs).to eql(updated_data["normal"])
+        expect(updated_node.policy_name).to eql(updated_data["policy_name"])
+        expect(updated_node.policy_group).to eql(updated_data["policy_group"])
+        expect(updated_node.run_list.map(&:to_s)).to eql(updated_data["run_list"])
+
+        # Expected not to have changed
+        expect(updated_node.default_attrs).to eql(node.default_attrs)
+        expect(updated_node.override_attrs).to eql(node.override_attrs)
+        expect(updated_node.automatic_attrs).to eql(node.automatic_attrs)
+      end
+    end
+
+    context "when config[:all_attributes] == true" do
+      let(:config) { base_config.merge(all_attributes: true) }
+
+      let(:updated_data) do
+        subject.view.merge(
+          "default"   => { "alpha" => { "bravo" => "charlie2", "delta" => "echo2" } },
+          "normal"    => { "alpha" => { "bravo" => "hotel2" }, "tags" => [ "xyz" ] },
+          "override"  => { "alpha" => { "bravo" => "foxtrot2", "delta" => "golf2" } },
+          "policy_name" => "mypolicy",
+          "policy_group" => "prod",
+          "run_list"  => %w{role[drama] recipe[mystery]},
+        )
+      end
+
+      it "returns a node with all editable properties changed" do
+        updated_node = subject.apply_updates(updated_data)
+        expect(updated_node).to be_a(Chef::Node)
+
+        expect(updated_node.chef_environment).to eql(updated_data["chef_environment"])
+        expect(updated_node.automatic_attrs).to eql(updated_data["automatic"])
+        expect(updated_node.normal_attrs).to eql(updated_data["normal"])
+        expect(updated_node.default_attrs).to eql(updated_data["default"])
+        expect(updated_node.override_attrs).to eql(updated_data["override"])
+        expect(updated_node.policy_name).to eql(updated_data["policy_name"])
+        expect(updated_node.policy_group).to eql(updated_data["policy_group"])
+        expect(updated_node.run_list.map(&:to_s)).to eql(updated_data["run_list"])
+      end
+    end
+  end
+
+  describe '#updated?' do
+    context "before the node has been edited" do
+      it "returns false" do
+        expect(subject.updated?).to be false
+      end
+    end
+
+    context "after the node has been edited" do
+      context "and changes were made" do
+        let(:updated_data) do
+          subject.view.merge(
+            "default"   => { "alpha" => { "bravo" => "charlie2", "delta" => "echo2" } },
+            "normal"    => { "alpha" => { "bravo" => "hotel2" }, "tags" => [ "xyz" ] },
+            "override"  => { "alpha" => { "bravo" => "foxtrot2", "delta" => "golf2" } },
+            "policy_name"  => "mypolicy",
+            "policy_group" => "prod",
+            "run_list"  => %w{role[drama] recipe[mystery]},
+          )
+        end
+
+        context "and changes affect only editable properties" do
+          before(:each) do
+            allow(ui).to receive(:edit_data)
+              .with(subject.view)
+              .and_return(updated_data)
+
+            subject.edit_node
+          end
+
+          it "returns an array of the changed property names" do
+            expect(subject.updated?).to eql %w{ normal policy_name policy_group run_list }
+          end
+        end
+
+        context "and the changes include non-editable properties" do
+          before(:each) do
+            data = updated_data.merge("bad_property" => "bad_value")
+
+            allow(ui).to receive(:edit_data)
+              .with(subject.view)
+              .and_return(data)
+
+            subject.edit_node
+          end
+
+          it 'returns an array of property names that doesn\'t include ' +
+            "the non-editable properties" do
+            expect(subject.updated?).to eql %w{ normal policy_name policy_group run_list }
+          end
+        end
+      end
+
+      context "and changes were not made" do
+        before(:each) do
+          allow(ui).to receive(:edit_data)
+            .with(subject.view)
+            .and_return(subject.view.dup)
+
+          subject.edit_node
+        end
+
+        it { is_expected.not_to be_updated }
+      end
+    end
+  end
+end