5 files changed, 98 insertions, 2 deletions
diff --git a/rubocop/cop/active_record_dependent.rb b/rubocop/cop/active_record_dependent.rb
new file mode 100644
index 00000000000..8d15f150885
--- /dev/null
+++ b/rubocop/cop/active_record_dependent.rb
@@ -0,0 +1,26 @@
+require_relative '../model_helpers'
+
+module RuboCop
+  module Cop
+    # Cop that prevents the use of `dependent: ...` in ActiveRecord models.
+    class ActiveRecordDependent < RuboCop::Cop::Cop
+      include ModelHelpers
+
+      MSG = 'Do not use `dependent: to remove associated data, ' \
+        'use foreign keys with cascading deletes instead'.freeze
+
+      METHOD_NAMES = [:has_many, :has_one, :belongs_to].freeze
+
+      def on_send(node)
+        return unless in_model?(node)
+        return unless METHOD_NAMES.include?(node.children[1])
+
+        node.children.last.each_node(:pair) do |pair|
+          key_name = pair.children[0].children[0]
+
+          add_offense(pair, :expression) if key_name == :dependent
+        end
+      end
+    end
+  end
+end
diff --git a/rubocop/cop/activerecord_serialize.rb b/rubocop/cop/active_record_serialize.rb
index 9bdcc3b4c34..204caf37f8b 100644
--- a/rubocop/cop/activerecord_serialize.rb
+++ b/rubocop/cop/active_record_serialize.rb
@@ -3,7 +3,7 @@ require_relative '../model_helpers'
 module RuboCop
   module Cop
     # Cop that prevents the use of `serialize` in ActiveRecord models.
-    class ActiverecordSerialize < RuboCop::Cop::Cop
+    class ActiveRecordSerialize < RuboCop::Cop::Cop
       include ModelHelpers
 
       MSG = 'Do not store serialized data in the database, use separate columns and/or tables instead'.freeze
diff --git a/rubocop/cop/in_batches.rb b/rubocop/cop/in_batches.rb
new file mode 100644
index 00000000000..c0240187e66
--- /dev/null
+++ b/rubocop/cop/in_batches.rb
@@ -0,0 +1,16 @@
+require_relative '../model_helpers'
+
+module RuboCop
+  module Cop
+    # Cop that prevents the use of `in_batches`
+    class InBatches < RuboCop::Cop::Cop
+      MSG = 'Do not use `in_batches`, use `each_batch` from the EachBatch module instead'.freeze
+
+      def on_send(node)
+        return unless node.children[1] == :in_batches
+
+        add_offense(node, :selector)
+      end
+    end
+  end
+end
diff --git a/rubocop/cop/project_path_helper.rb b/rubocop/cop/project_path_helper.rb
new file mode 100644
index 00000000000..3e1ce71ac06
--- /dev/null
+++ b/rubocop/cop/project_path_helper.rb
@@ -0,0 +1,51 @@
+module RuboCop
+  module Cop
+    class ProjectPathHelper < RuboCop::Cop::Cop
+      MSG = 'Use short project path helpers without explicitly passing the namespace: ' \
+        '`foo_project_bar_path(project, bar)` instead of ' \
+        '`foo_namespace_project_bar_path(project.namespace, project, bar)`.'.freeze
+
+      METHOD_NAME_PATTERN = /\A([a-z_]+_)?namespace_project(?:_[a-z_]+)?_(?:url|path)\z/.freeze
+
+      def on_send(node)
+        return unless method_name(node).to_s =~ METHOD_NAME_PATTERN
+
+        namespace_expr, project_expr = arguments(node)
+        return unless namespace_expr && project_expr
+
+        return unless namespace_expr.type == :send
+        return unless method_name(namespace_expr) == :namespace
+        return unless receiver(namespace_expr) == project_expr
+
+        add_offense(node, :selector)
+      end
+
+      def autocorrect(node)
+        helper_name = method_name(node).to_s.sub('namespace_project', 'project')
+
+        arguments = arguments(node)
+        arguments.shift # Remove namespace argument
+
+        replacement = "#{helper_name}(#{arguments.map(&:source).join(', ')})"
+
+        lambda do |corrector|
+          corrector.replace(node.source_range, replacement)
+        end
+      end
+
+      private
+
+      def receiver(node)
+        node.children[0]
+      end
+
+      def method_name(node)
+        node.children[1]
+      end
+
+      def arguments(node)
+        node.children[2..-1]
+      end
+    end
+  end
+end
diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb
index 55d7708fa8c..f76144275c9 100644
--- a/rubocop/rubocop.rb
+++ b/rubocop/rubocop.rb
@@ -1,8 +1,11 @@
 require_relative 'cop/custom_error_class'
 require_relative 'cop/gem_fetcher'
-require_relative 'cop/activerecord_serialize'
+require_relative 'cop/active_record_serialize'
 require_relative 'cop/redirect_with_status'
 require_relative 'cop/polymorphic_associations'
+require_relative 'cop/project_path_helper'
+require_relative 'cop/active_record_dependent'
+require_relative 'cop/in_batches'
 require_relative 'cop/migration/add_column'
 require_relative 'cop/migration/add_column_with_default_to_large_table'
 require_relative 'cop/migration/add_concurrent_foreign_key'