Renamed compare_value in env provider

3 files changed, 18 insertions, 18 deletions

diff --git a/lib/chef/provider/env.rb b/lib/chef/provider/env.rb
index 324371254d..dac34e7d9c 100644
--- a/lib/chef/provider/env.rb
+++ b/lib/chef/provider/env.rb
@@ -58,7 +58,7 @@ class Chef
       # ==== Returns
       # <true>:: If a change is required
       # <false>:: If a change is not required
-      def compare_value
+      def requires_modify_or_create?
         if @new_resource.delim
           #e.g. check for existing value within PATH
           not new_values.all? do |val|
@@ -71,7 +71,7 @@ class Chef
 
       def action_create
         if @key_exists
-          if compare_value
+          if requires_modify_or_create?
             modify_env
             Chef::Log.info("#{@new_resource} altered")
             @new_resource.updated_by_last_action(true)
@@ -123,7 +123,7 @@ class Chef
 
       def action_modify
         if @key_exists
-          if compare_value
+          if requires_modify_or_create?
             modify_env
             Chef::Log.info("#{@new_resource} modified")
             @new_resource.updated_by_last_action(true)
diff --git a/spec/unit/provider/env/windows_spec.rb b/spec/unit/provider/env/windows_spec.rb
index 2ea137c1d9..84582d8b4d 100644
--- a/spec/unit/provider/env/windows_spec.rb
+++ b/spec/unit/provider/env/windows_spec.rb
@@ -53,7 +53,7 @@ describe Chef::Provider::Env::Windows, :windows_only do
       end
 
       it "should update the ruby ENV object when it updates the value" do
-        provider.should_receive(:compare_value).and_return(true)
+        provider.should_receive(:requires_modify_or_create?).and_return(true)
         new_resource.value("foobar")
         provider.action_modify
         expect(ENV['CHEF_WINDOWS_ENV_TEST']).to eql('foobar')
@@ -92,7 +92,7 @@ describe Chef::Provider::Env::Windows, :windows_only do
       end
 
       it "replaces Windows system variables" do
-        provider.should_receive(:compare_value).and_return(true)
+        provider.should_receive(:requires_modify_or_create?).and_return(true)
         provider.should_receive(:expand_path).with(system_root).and_return(system_root_value)
         provider.action_modify
         expect(ENV['PATH']).to eql(system_root_value)
diff --git a/spec/unit/provider/env_spec.rb b/spec/unit/provider/env_spec.rb
index f5e19fc5fb..f8803f9bb6 100644
--- a/spec/unit/provider/env_spec.rb
+++ b/spec/unit/provider/env_spec.rb
@@ -88,20 +88,20 @@ describe Chef::Provider::Env do
 
     it "should check to see if the values are the same if the key exists" do
       @provider.key_exists = true
-      @provider.should_receive(:compare_value).and_return(false)
+      @provider.should_receive(:requires_modify_or_create?).and_return(false)
       @provider.action_create
     end
 
     it "should call modify_env if the key exists and values are not equal" do
       @provider.key_exists = true
-      @provider.stub(:compare_value).and_return(true)
+      @provider.stub(:requires_modify_or_create?).and_return(true)
       @provider.should_receive(:modify_env).and_return(true)
       @provider.action_create
     end
 
     it "should set the new_resources updated flag when it updates an existing value" do
       @provider.key_exists = true
-      @provider.stub(:compare_value).and_return(true)
+      @provider.stub(:requires_modify_or_create?).and_return(true)
       @provider.stub(:modify_env).and_return(true)
       @provider.action_create
       @new_resource.should be_updated
@@ -147,20 +147,20 @@ describe Chef::Provider::Env do
     end
 
     it "should call modify_group if the key exists and values are not equal" do
-      @provider.should_receive(:compare_value).and_return(true)
+      @provider.should_receive(:requires_modify_or_create?).and_return(true)
       @provider.should_receive(:modify_env).and_return(true)
       @provider.action_modify
     end
 
     it "should set the new resources updated flag to true if modify_env is called" do
-      @provider.stub(:compare_value).and_return(true)
+      @provider.stub(:requires_modify_or_create?).and_return(true)
       @provider.stub(:modify_env).and_return(true)
       @provider.action_modify
       @new_resource.should be_updated
     end
 
     it "should not call modify_env if the key exists but the values are equal" do
-      @provider.should_receive(:compare_value).and_return(false)
+      @provider.should_receive(:requires_modify_or_create?).and_return(false)
       @provider.should_not_receive(:modify_env)
       @provider.action_modify
     end
@@ -222,7 +222,7 @@ describe Chef::Provider::Env do
     end
   end
 
-  describe "compare_value" do
+  describe "requires_modify_or_create?" do
     before(:each) do
       @new_resource.value("C:/bar")
       @current_resource = @new_resource.clone
@@ -230,25 +230,25 @@ describe Chef::Provider::Env do
     end
 
     it "should return false if the values are equal" do
-      @provider.compare_value.should be_false
+      @provider.requires_modify_or_create?.should be_false
     end
 
     it "should return true if the values not are equal" do
       @new_resource.value("C:/elsewhere")
-      @provider.compare_value.should be_true
+      @provider.requires_modify_or_create?.should be_true
     end
 
     it "should return false if the current value contains the element" do
       @new_resource.delim(";")
       @current_resource.value("C:/bar;C:/foo;C:/baz")
 
-      @provider.compare_value.should be_false
+      @provider.requires_modify_or_create?.should be_false
     end
 
     it "should return true if the current value does not contain the element" do
       @new_resource.delim(";")
       @current_resource.value("C:/biz;C:/foo/bin;C:/baz")
-      @provider.compare_value.should be_true
+      @provider.requires_modify_or_create?.should be_true
     end
 
     context "when new_resource's value contains the delimiter"  do
@@ -256,14 +256,14 @@ describe Chef::Provider::Env do
         @new_resource.value("C:/biz;C:/baz")
         @new_resource.delim(";")
         @current_resource.value("C:/biz;C:/foo/bin;C:/baz")
-        @provider.compare_value.should be_false
+        @provider.requires_modify_or_create?.should be_false
       end
 
       it "should return true if any of the new values are not contained" do
         @new_resource.value("C:/biz;C:/baz;C:/bin")
         @new_resource.delim(";")
         @current_resource.value("C:/biz;C:/foo/bin;C:/baz")
-        @provider.compare_value.should be_true
+        @provider.requires_modify_or_create?.should be_true
       end
     end
   end