merge fix

Author: mellyeliu

packages/cli/__tests__/compile-stylex-folder-test.js

@@ -347,11 +347,11 @@ describe('CLI works with a custom cache path', () => {
   config.cachePath = customCachePath;
 
   beforeEach(async () => {
-    writeSpy2 = jest.spyOn(cacheModule, 'writeCache');
+    writeSpy = jest.spyOn(cacheModule, 'writeCache');
   });
 
   afterEach(() => {
-    writeSpy2.mockRestore();
+    writeSpy.mockRestore();
   });
 
   afterAll(async () => {
@@ -399,8 +399,8 @@ describe('CLI works with a custom cache path', () => {
     await compileDirectory(config);
 
     // Ensure no additional writes were made due to no file changes
-    expect(writeSpy2).toHaveBeenCalledTimes(0);
-    writeSpy2.mockRestore();
+    expect(writeSpy).toHaveBeenCalledTimes(0);
+    writeSpy.mockRestore();
 
     const customFilePath = path.join(config.input, 'index.js');