small fixes

Author: loujaybee

backend/catalog/package.json

@@ -9,8 +9,7 @@
     "build": "tsc",
     "test": "jest",
     "setup": "./scripts/setup.sh",
-    "renovate": "if [ \"$npm_config_live\" ]; then DRY_RUN_FLAG=\"\"; echo 'LIVE MODE: Will create actual pull requests'; else DRY_RUN_FLAG=\"--dry-run=full\"; echo 'DRY RUN MODE: No pull requests will be created (use --live to create PRs)'; fi && RENOVATE_TOKEN=$GH_CLI_TOKEN LOG_LEVEL=debug renovate --platform=github $DRY_RUN_FLAG gitpod-samples/gitpodflix-demo > renovate_debug.txt 2>&1 && echo 'Renovate scan complete! Check renovate_debug.txt for full output' && if [ \"$npm_config_filter\" ]; then echo 'Filtering results for:' $npm_config_filter && grep -i -A 20 -B 5 \"$npm_config_filter\" renovate_debug.txt; else echo 'Use --filter=<package> to filter results for specific dependency'; fi",
-    "renovate:jest": "echo 'Creating Jest v30 pull request...' && echo '{\"extends\":[],\"enabledManagers\":[\"npm\"],\"includePaths\":[\"backend/catalog/package.json\"],\"packageRules\":[{\"matchPackageNames\":[\"jest\",\"@types/jest\"],\"enabled\":true}],\"prConcurrentLimit\":0,\"prHourlyLimit\":0,\"branchConcurrentLimit\":0}' > renovate-jest-only.json && RENOVATE_TOKEN=$GH_CLI_TOKEN RENOVATE_CONFIG_FILE=renovate-jest-only.json renovate --platform=github gitpod-samples/gitpodflix-demo && rm renovate-jest-only.json"
+    "renovate:jest": "echo 'Creating Jest v30 pull request...' && cd /workspaces/gitpodflix-demo && RENOVATE_TOKEN=$GH_CLI_TOKEN renovate --platform=github gitpod-samples/gitpodflix-demo"
   },
   "dependencies": {
     "express": "^4.18.2",

backend/catalog/src/__tests__/deprecated-matchers.test.ts

@@ -1,11 +1,9 @@
-// This test file uses Jest v29 deprecated matcher syntax that will break in v30
 describe('Jest v29 Deprecated Matchers Demo', () => {
   describe('Mock function matchers that will break in Jest v30', () => {
     it('uses toBeCalled instead of toHaveBeenCalled', () => {
       const mockFn = jest.fn();
       mockFn('test');
 
-      // This will break in Jest v30 - should be toHaveBeenCalled()
       expect(mockFn).toBeCalled();
     });
 
@@ -14,15 +12,13 @@ describe('Jest v29 Deprecated Matchers Demo', () => {
       mockFn('first');
       mockFn('second');
 
-      // This will break in Jest v30 - should be toHaveBeenCalledTimes()
       expect(mockFn).toBeCalledTimes(2);
     });
 
     it('uses toBeCalledWith instead of toHaveBeenCalledWith', () => {
       const mockFn = jest.fn();
       mockFn('test-arg');
 
-      // This will break in Jest v30 - should be toHaveBeenCalledWith()
       expect(mockFn).toBeCalledWith('test-arg');
     });
 
@@ -31,7 +27,6 @@ describe('Jest v29 Deprecated Matchers Demo', () => {
       mockFn('first');
       mockFn('last');
 
-      // This will break in Jest v30 - should be toHaveBeenLastCalledWith()
       expect(mockFn).lastCalledWith('last');
     });
 
@@ -40,7 +35,6 @@ describe('Jest v29 Deprecated Matchers Demo', () => {
       mockFn('first');
       mockFn('second');
 
-      // This will break in Jest v30 - should be toHaveBeenNthCalledWith()
       expect(mockFn).nthCalledWith(1, 'first');
       expect(mockFn).nthCalledWith(2, 'second');
     });
@@ -51,7 +45,6 @@ describe('Jest v29 Deprecated Matchers Demo', () => {
       const mockFn = jest.fn().mockReturnValue('result');
       mockFn();
 
-      // This will break in Jest v30 - should be toHaveReturned()
       expect(mockFn).toReturn();
     });
 
@@ -60,15 +53,13 @@ describe('Jest v29 Deprecated Matchers Demo', () => {
       mockFn();
       mockFn();
 
-      // This will break in Jest v30 - should be toHaveReturnedTimes()
       expect(mockFn).toReturnTimes(2);
     });
 
     it('uses toReturnWith instead of toHaveReturnedWith', () => {
       const mockFn = jest.fn().mockReturnValue('specific-result');
       mockFn();
 
-      // This will break in Jest v30 - should be toHaveReturnedWith()
       expect(mockFn).toReturnWith('specific-result');
     });
 
@@ -79,7 +70,6 @@ describe('Jest v29 Deprecated Matchers Demo', () => {
       mockFn();
       mockFn();
 
-      // This will break in Jest v30 - should be toHaveLastReturnedWith()
       expect(mockFn).lastReturnedWith('last');
     });
 
@@ -90,7 +80,6 @@ describe('Jest v29 Deprecated Matchers Demo', () => {
       mockFn();
       mockFn();
 
-      // This will break in Jest v30 - should be toHaveNthReturnedWith()
       expect(mockFn).nthReturnedWith(1, 'first');
       expect(mockFn).nthReturnedWith(2, 'second');
     });
@@ -102,7 +91,6 @@ describe('Jest v29 Deprecated Matchers Demo', () => {
         throw new Error('Test error');
       };
 
-      // This will break in Jest v30 - should be toThrow()
       expect(errorFn).toThrowError('Test error');
     });
 
@@ -111,7 +99,6 @@ describe('Jest v29 Deprecated Matchers Demo', () => {
         throw new Error('Any error');
       };
 
-      // This will break in Jest v30 - should be toThrow()
       expect(errorFn).toThrowError();
     });
   });

demos/fixing-renovate-dependencies.md

@@ -0,0 +1,69 @@
+# Fixing Renovate Dependencies Demo
+
+This demo shows how to use Renovate to create pull requests for dependency updates and then use AI assistance to resolve any breaking changes.
+
+## Prerequisites
+
+- Access to a Gitpod environment with this repository
+- GitHub CLI token configured (`GH_CLI_TOKEN` environment variable)
+- Renovate CLI installed (included in the devcontainer)
+
+## Steps to Replicate
+
+### 1. Create a Renovate Pull Request
+
+Navigate to the catalog service directory and run the renovate Jest command:
+
+```bash
+cd backend/catalog
+npm run renovate:jest
+```
+
+This command will:
+
+- Use the existing `renovate.json` configuration
+- Create a pull request specifically for Jest dependency updates
+- Target Jest upgrades that may introduce breaking changes
+
+### 2. Review the Pull Request
+
+After the command completes, check the GitHub repository for the newly created pull request. The PR will contain:
+
+- Updated Jest dependencies
+- Breaking changes that need to be addressed
+
+### 3. Resolve Breaking Changes with AI
+
+You have several options to get AI assistance for resolving the breaking changes:
+
+#### Option A: Using GitHub CLI
+
+```bash
+# Get PR details and diff
+gh pr view <PR_NUMBER> --json body,title,files
+gh pr diff <PR_NUMBER>
+
+# Use this information to prompt your AI assistant
+```
+
+#### Option B: Manual Context Gathering
+
+1. Copy the PR description and diff manually
+2. Include relevant test files that might be affected
+3. Construct a prompt asking for help with Jest migration
+
+#### Option C: Direct File Analysis
+
+1. Review the failing tests after merging the PR
+2. Copy error messages and affected code
+3. Ask AI to help fix the deprecated Jest matchers
+
+## Example AI Prompt
+
+```
+I have a Jest upgrade from v29 to v30 that's causing test failures due to deprecated matchers. Here are the failing tests:
+
+[Include test file contents and error messages]
+
+Please help me update the deprecated Jest matchers to their v30 equivalents.
+```

renovate.json

@@ -1,23 +1,15 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ],
+  "extends": [],
+  "enabledManagers": ["npm"],
+  "includePaths": ["backend/catalog/package.json"],
   "packageRules": [
     {
-      "matchPackageNames": ["jest"],
+      "matchPackageNames": ["jest", "@types/jest"],
       "enabled": true
     }
   ],
-  "prConcurrentLimit": 1,
-  "prHourlyLimit": 1,
-  "timezone": "UTC",
-  "schedule": ["at any time"],
-  "dependencyDashboard": true,
-  "dependencyDashboardTitle": "Renovate Dashboard",
-  "commitMessagePrefix": "chore(deps): ",
-  "commitMessageAction": "update",
-  "commitMessageTopic": "{{depName}}",
-  "commitMessageExtra": "to {{newVersion}}",
-  "semanticCommits": "enabled"
+  "prConcurrentLimit": 0,
+  "prHourlyLimit": 0,
+  "branchConcurrentLimit": 0
 }