Move both controller and request specs on controller move

lib/packs/private.rb

@@ -131,7 +131,7 @@ def self.move_to_pack!(pack_name:, paths_relative_to_root:, per_file_processors:
             )
             [
               file_move_operation,
-              file_move_operation.spec_file_move_operation
+              *file_move_operation.spec_file_move_operations
             ]
           end
           file_move_operations.each do |file_move_operation|
@@ -358,7 +358,7 @@ def self.make_public!(paths_relative_to_root:, per_file_processors:)
 
             [
               file_move_operation,
-              file_move_operation.spec_file_move_operation
+              *file_move_operation.spec_file_move_operations
             ]
           end
 

lib/packs/private/file_move_operation.rb

@@ -51,8 +51,8 @@ def self.destination_pathname_for_new_public_api(origin_pathname)
         ).cleanpath
       end
 
-      sig { returns(FileMoveOperation) }
-      def spec_file_move_operation
+      sig { returns(T::Array[FileMoveOperation]) }
+      def spec_file_move_operations
         path_parts = filepath_without_pack_name.split('/')
         folder = T.must(path_parts[0])
         file_extension = T.must(filepath_without_pack_name.split('.').last)
@@ -67,11 +67,20 @@ def spec_file_move_operation
           new_destination_pathname = spec_pathname_for_non_app(destination_pathname, file_extension, folder)
         end
 
-        FileMoveOperation.new(
-          origin_pathname: new_origin_pathname,
-          destination_pathname: new_destination_pathname,
-          destination_pack: destination_pack
-        )
+        ops = [
+          FileMoveOperation.new(
+            origin_pathname: new_origin_pathname,
+            destination_pathname: new_destination_pathname,
+            destination_pack: destination_pack
+          )
+        ]
+
+        # For controllers, also include the request spec (spec/requests/<name>_spec.rb) if it exists.
+        # Request specs are named without "controller" suffix (e.g. my_controller -> my_spec)
+        request_spec_op = request_spec_file_move_operation
+        ops << request_spec_op if request_spec_op
+
+        ops
       end
 
       sig { params(filepath: Pathname, pack: T.nilable(Packs::Pack)).returns(String) }
@@ -106,6 +115,33 @@ def spec_pathname_for_non_app(pathname, file_extension, folder)
           .sub(".#{file_extension}", '_spec.rb')
       end
 
+      # Maps app/controllers/<namespaces/>*_controller.rb to spec/requests/<namespaces/>*_spec.rb.
+      # Returns nil if the path is not a controller path.
+      sig { params(pathname: Pathname).returns(T.nilable(Pathname)) }
+      def pathname_to_request_spec(pathname)
+        return nil unless pathname.to_s.end_with?('_controller.rb')
+
+        pathname
+          .sub('app/controllers/', 'spec/requests/')
+          .sub(/_controller\.rb\z/, '_spec.rb')
+          .cleanpath
+      end
+
+      sig { returns(T.nilable(FileMoveOperation)) }
+      def request_spec_file_move_operation
+        request_spec_origin = pathname_to_request_spec(origin_pathname)
+        return if request_spec_origin.nil? || !request_spec_origin.exist?
+
+        request_spec_destination = pathname_to_request_spec(destination_pathname)
+        return if request_spec_destination.nil?
+
+        FileMoveOperation.new(
+          origin_pathname: request_spec_origin,
+          destination_pathname: request_spec_destination,
+          destination_pack: destination_pack
+        )
+      end
+
       sig { params(path: Pathname).returns(FileMoveOperation) }
       def relative_to(path)
         FileMoveOperation.new(

spec/packs_spec.rb

@@ -405,6 +405,57 @@ def write_codeownership_config
                               ])
       end
 
+      it 'moves the request spec when moving a controller if spec/requests/<name>_spec.rb exists (name = controller minus "controller")' do
+        write_file('app/controllers/my_controller.rb')
+        write_file('spec/requests/my_spec.rb')
+        write_package_yml('packs/my_pack')
+        Packs.move_to_pack!(
+          pack_name: 'packs/my_pack',
+          paths_relative_to_root: ['app/controllers/my_controller.rb']
+        )
+
+        expect_files_to_not_exist([
+                                    'app/controllers/my_controller.rb',
+                                    'spec/requests/my_spec.rb'
+                                  ])
+        expect_files_to_exist([
+                                'packs/my_pack/app/controllers/my_controller.rb',
+                                'packs/my_pack/spec/requests/my_spec.rb'
+                              ])
+      end
+
+      it 'moves namespaced request spec when moving a namespaced controller' do
+        write_file('app/controllers/api/v1/users_controller.rb')
+        write_file('spec/requests/api/v1/users_spec.rb')
+        write_package_yml('packs/my_pack')
+        Packs.move_to_pack!(
+          pack_name: 'packs/my_pack',
+          paths_relative_to_root: ['app/controllers/api/v1/users_controller.rb']
+        )
+
+        expect_files_to_not_exist([
+                                    'app/controllers/api/v1/users_controller.rb',
+                                    'spec/requests/api/v1/users_spec.rb'
+                                  ])
+        expect_files_to_exist([
+                                'packs/my_pack/app/controllers/api/v1/users_controller.rb',
+                                'packs/my_pack/spec/requests/api/v1/users_spec.rb'
+                              ])
+      end
+
+      it 'does not move a request spec when no file exists at spec/requests/<name>_spec.rb' do
+        write_file('app/controllers/my_controller.rb')
+        # no spec/requests/my_spec.rb
+        write_package_yml('packs/my_pack')
+        Packs.move_to_pack!(
+          pack_name: 'packs/my_pack',
+          paths_relative_to_root: ['app/controllers/my_controller.rb']
+        )
+
+        expect_files_to_not_exist(['app/controllers/my_controller.rb'])
+        expect_files_to_exist(['packs/my_pack/app/controllers/my_controller.rb'])
+      end
+
       it 'can move files from non-pack packages into a pack' do
         target_pack = 'packs/animals'
         file_to_move = 'lib/tasks/donkey.rake'