Move the conflicts cop as well

Signed-off-by: Tim Smith <tsmith@chef.io>
chef · Dec 7, 2019 · b332c0a · b332c0a
1 parent e4741cf
commit b332c0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...op/chef/deprecation/conflicts_metadata.rb → .../cop/chef/modernize/conflicts_metadata.rb b/...op/chef/deprecation/conflicts_metadata.rb → .../cop/chef/modernize/conflicts_metadata.rb
@@ -18,8 +18,8 @@
 module RuboCop
   module Cop
     module Chef
-      module ChefDeprecations
-        # Don't use the deprecated 'conflicts' metadata value
+      module ChefModernize
+        # The conflicts metadata.rb method is not used and is unnecessary in cookbooks.
         #
         # @example
         #
@@ -28,7 +28,7 @@ module ChefDeprecations
         #   conflicts "another_cookbook"
         #
         class ConflictsMetadata < Cop
-          MSG = "Don't use the deprecated 'conflicts' metadata value".freeze
+          MSG = "The conflicts metadata.rb method is not used and is unnecessary in cookbooks.".freeze
 
           def on_send(node)
             add_offense(node, location: :expression, message: MSG, severity: :refactor) if node.method_name == :conflicts

diff --git a/...ef/deprecation/conflicts_metadata_spec.rb → ...chef/modernize/conflicts_metadata_spec.rb b/...ef/deprecation/conflicts_metadata_spec.rb → ...chef/modernize/conflicts_metadata_spec.rb
@@ -16,13 +16,13 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::Chef::ChefDeprecations::ConflictsMetadata, :config do
+describe RuboCop::Cop::Chef::ChefModernize::ConflictsMetadata, :config do
   subject(:cop) { described_class.new(config) }
 
   it 'registers an offense when metadata uses "conflicts"' do
     expect_offense(<<~RUBY)
       conflicts 'foo'
-      ^^^^^^^^^^^^^^^ Don't use the deprecated 'conflicts' metadata value
+      ^^^^^^^^^^^^^^^ The conflicts metadata.rb method is not used and is unnecessary in cookbooks.
     RUBY
 
     expect_correction("\n")