Merge remote-tracking branch 'upstream/unstable' into remove-vuetify-5670

Author: vtushar06

.github/dependabot.yml

@@ -4,7 +4,7 @@ version: 2
 updates:
 
   # Maintain dependencies for Python
-  - package-ecosystem: "pip"
+  - package-ecosystem: "uv"
     directory: "/"
     schedule:
       interval: "monthly"

.github/workflows/call-pull-request-target.yml

@@ -0,0 +1,11 @@
+name: Handle pull request events
+on:
+  pull_request_target:
+    types: [review_requested, labeled]
+jobs:
+  call-workflow:
+    name: Call shared workflow
+    uses: learningequality/.github/.github/workflows/pull-request-target.yml@main
+    secrets:
+      LE_BOT_APP_ID: ${{ secrets.LE_BOT_APP_ID }}
+      LE_BOT_PRIVATE_KEY: ${{ secrets.LE_BOT_PRIVATE_KEY }}

.github/workflows/deploytest.yml

@@ -48,24 +48,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v6
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v6
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
       with:
         python-version: '3.10'
-    - name: pip cache
-      uses: actions/cache@v5
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pyprod-${{ hashFiles('requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pyprod-
-    - name: Install pip-tools and python dependencies
+        activate-environment: "true"
+        enable-cache: "true"
+    - name: Install python dependencies with uv
       run: |
-        # Pin pip to 25.2 to avoid incompatibility with pip-tools and 25.3
-        # see https://github.com/jazzband/pip-tools/issues/2252
-        python -m pip install pip==25.2
-        pip install pip-tools
-        pip-sync requirements.txt
+        # Use uv to install dependencies directly from requirements files
+        uv pip sync requirements.txt
     - name: Use pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js

.github/workflows/pre-commit.yml

@@ -32,9 +32,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v6
-    - uses: actions/setup-python@v6
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
       with:
         python-version: '3.10'
+        ignore-nothing-to-cache: 'true'
     - name: Use pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js

.github/workflows/pythontest.yml

@@ -69,24 +69,16 @@ jobs:
                     -e "MINIO_ROOT_PASSWORD=development" \
                     -e "MINIO_DEFAULT_BUCKETS=content:public" \
                     bitnamilegacy/minio:2024.5.28
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v6
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
       with:
         python-version: '3.10'
-    - name: pip cache
-      uses: actions/cache@v5
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pytest-${{ hashFiles('requirements.txt', 'requirements-dev.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pytest-
-    - name: Install pip-tools and python dependencies
+        activate-environment: "true"
+        enable-cache: "true"
+    - name: Install python dependencies with uv
       run: |
-        # Pin pip to 25.2 to avoid incompatibility with pip-tools and 25.3
-        # see https://github.com/jazzband/pip-tools/issues/2252
-        python -m pip install pip==25.2
-        pip install pip-tools
-        pip-sync requirements.txt requirements-dev.txt
+        # Use uv to install dependencies directly from requirements files
+        uv pip sync requirements.txt requirements-dev.txt
     - name: Test pytest
       run: |
         sh -c './contentcuration/manage.py makemigrations --check'

.gitignore

@@ -25,6 +25,7 @@ var/
 
 # Ignore editor / IDE related data
 .vscode/
+.claude/
 
 # IntelliJ IDE, except project config
 .idea/
@@ -129,6 +130,3 @@ storybook-static/
 
 # i18n
 /contentcuration/locale/**/LC_MESSAGES/*.csv
-
-# pyenv
-.python-version

.python-version

@@ -0,0 +1 @@
+3.10

Makefile

@@ -1,9 +1,9 @@
 # standalone install method
-DOCKER_COMPOSE = docker-compose
+DOCKER_COMPOSE ?= docker-compose
 
 # support new plugin installation for docker-compose
-ifeq (, $(shell which docker-compose))
-DOCKER_COMPOSE = docker compose
+ifeq (, $(shell command -v docker-compose 2>/dev/null))
+DOCKER_COMPOSE := docker compose
 endif
 
 ###############################################################
@@ -196,8 +196,8 @@ dctest: .docker/minio .docker/postgres
 
 dcservicesup: .docker/minio .docker/postgres
 	# launch all studio's dependent services using docker-compose
-	$(DOCKER_COMPOSE) -f docker-compose.yml -f docker-compose.alt.yml up minio postgres redis
+	$(DOCKER_COMPOSE) up minio postgres redis
 
 dcservicesdown:
 	# stop services that were started using dcservicesup
-	$(DOCKER_COMPOSE) -f docker-compose.yml -f docker-compose.alt.yml down
+	$(DOCKER_COMPOSE) down

contentcuration/contentcuration/frontend/accounts/pages/__tests__/forgotPassword.spec.js

@@ -1,33 +1,79 @@
-import { mount } from '@vue/test-utils';
+import { render, screen, fireEvent, waitFor } from '@testing-library/vue';
 import VueRouter from 'vue-router';
 import ForgotPassword from '../resetPassword/ForgotPassword';
 
-function makeWrapper() {
-  return mount(ForgotPassword, {
-    // Need to add a router instance as a child component relies on route linking
-    router: new VueRouter(),
+const sendPasswordResetLinkMock = jest.fn(() => Promise.resolve());
+
+const renderComponent = () => {
+  const router = new VueRouter({
+    routes: [
+      { path: '/', name: 'Main' },
+      { path: '/forgot-password', name: 'ForgotPassword' },
+      { path: '/password-instructions-sent', name: 'PasswordInstructionsSent' },
+    ],
+  });
+
+  const utils = render(ForgotPassword, {
+    router,
+    store: {
+      modules: {
+        account: {
+          namespaced: true,
+          actions: {
+            sendPasswordResetLink: sendPasswordResetLinkMock,
+          },
+        },
+      },
+    },
   });
-}
 
-describe('forgotPassword', () => {
-  let wrapper;
-  let sendPasswordResetLink;
+  return { ...utils, router };
+};
 
+describe('ForgotPassword', () => {
   beforeEach(() => {
-    wrapper = makeWrapper();
-    sendPasswordResetLink = jest.spyOn(wrapper.vm, 'sendPasswordResetLink');
-    sendPasswordResetLink.mockImplementation(() => Promise.resolve());
-  });
-  it('should not call sendPasswordResetLink on submit if email is invalid', async () => {
-    wrapper.findComponent({ ref: 'form' }).trigger('submit');
-    await wrapper.vm.$nextTick();
-    expect(sendPasswordResetLink).not.toHaveBeenCalled();
-  });
-  it('should call sendPasswordResetLink on submit if email is valid', async () => {
-    wrapper.setData({ email: 'test@test.com' });
-    await wrapper.vm.$nextTick();
-    wrapper.findComponent({ ref: 'form' }).trigger('submit');
-    await wrapper.vm.$nextTick();
-    expect(sendPasswordResetLink).toHaveBeenCalled();
+    jest.clearAllMocks();
+  });
+
+  it('should render the forgot password form', () => {
+    renderComponent();
+    expect(screen.getByText('Reset your password')).toBeInTheDocument();
+    expect(screen.getByLabelText('Email')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Submit' })).toBeInTheDocument();
+  });
+
+  it('should not submit form with empty email', async () => {
+    renderComponent();
+    await fireEvent.click(screen.getByRole('button', { name: 'Submit' }));
+    expect(sendPasswordResetLinkMock).not.toHaveBeenCalled();
+  });
+
+  it('should not submit form with invalid email', async () => {
+    renderComponent();
+    await fireEvent.update(screen.getByLabelText(/email/i), 'invalid-email');
+    await fireEvent.click(screen.getByRole('button', { name: 'Submit' }));
+    expect(sendPasswordResetLinkMock).not.toHaveBeenCalled();
+  });
+
+  it('should submit form with valid email and navigate to success page', async () => {
+    sendPasswordResetLinkMock.mockResolvedValue({});
+    const { router } = renderComponent();
+    await fireEvent.update(screen.getByLabelText(/email/i), 'test@test.com');
+    await fireEvent.click(screen.getByRole('button', { name: 'Submit' }));
+    await waitFor(() => {
+      expect(sendPasswordResetLinkMock).toHaveBeenCalledTimes(1);
+      expect(sendPasswordResetLinkMock).toHaveBeenCalledWith(expect.anything(), 'test@test.com');
+    });
+    await waitFor(() => {
+      expect(router.currentRoute.name).toBe('PasswordInstructionsSent');
+    });
+  });
+
+  it('should show error banner when submission fails', async () => {
+    sendPasswordResetLinkMock.mockRejectedValue(new Error('Failed'));
+    renderComponent();
+    await fireEvent.update(screen.getByLabelText(/email/i), 'test@test.com');
+    await fireEvent.click(screen.getByRole('button', { name: 'Submit' }));
+    expect(await screen.findByTestId('error-banner')).toBeInTheDocument();
   });
 });

contentcuration/contentcuration/frontend/accounts/pages/__tests__/requestNewActivationLink.spec.js

@@ -1,32 +1,77 @@
-import { mount } from '@vue/test-utils';
+import { render, screen, waitFor } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import Vuex from 'vuex';
+import Vue from 'vue';
 import VueRouter from 'vue-router';
 import RequestNewActivationLink from '../activateAccount/RequestNewActivationLink';
 
-function makeWrapper() {
-  return mount(RequestNewActivationLink, {
-    // Need to add a router instance as a child component relies on route linking
-    router: new VueRouter(),
+Vue.use(Vuex);
+Vue.use(VueRouter);
+let testStore;
+
+function createTestStore() {
+  testStore = new Vuex.Store({
+    modules: {
+      account: {
+        namespaced: true,
+        actions: {
+          sendActivationLink: jest.fn(() => Promise.resolve()),
+        },
+      },
+    },
   });
+  return testStore;
 }
 
-describe('requestNewActivationLink', () => {
-  let wrapper;
-  let sendActivationLink;
+function renderComponent() {
+  const router = new VueRouter({
+    routes: [
+      {
+        path: '/main',
+        name: 'Main',
+      },
+      {
+        path: '/activation-link-resent',
+        name: 'ActivationLinkReSent',
+      },
+    ],
+  });
 
-  beforeEach(() => {
-    wrapper = makeWrapper();
-    sendActivationLink = jest.spyOn(wrapper.vm, 'sendActivationLink');
-    sendActivationLink.mockImplementation(() => Promise.resolve());
+  return render(RequestNewActivationLink, {
+    store: createTestStore(),
+    router,
   });
+}
+
+describe('requestNewActivationLink', () => {
+  it('should show validation error when submitting with invalid email', async () => {
+    const user = userEvent.setup();
+    renderComponent();
+
+    const submitButton = screen.getByRole('button', { name: /submit/i });
+    await user.click(submitButton);
 
-  it('should not call sendActivationLink on submit if email is invalid', async () => {
-    await wrapper.findComponent({ ref: 'form' }).trigger('submit');
-    expect(sendActivationLink).not.toHaveBeenCalled();
+    await waitFor(() => {
+      expect(screen.getByText(/activation failed/i)).toBeInTheDocument();
+    });
   });
 
-  it('should call sendActivationLink on submit if email is valid', async () => {
-    await wrapper.setData({ email: 'test@test.com' });
-    await wrapper.findComponent({ ref: 'form' }).trigger('submit');
-    expect(sendActivationLink).toHaveBeenCalled();
+  it('should submit when email is valid', async () => {
+    const user = userEvent.setup();
+    renderComponent();
+    const sendActivationLink = jest.spyOn(testStore, 'dispatch');
+
+    const emailInput = screen.getByLabelText(/email/i);
+    const submitButton = screen.getByRole('button', { name: /submit/i });
+
+    await user.type(emailInput, 'test@test.com');
+    await user.click(submitButton);
+
+    await waitFor(() => {
+      expect(sendActivationLink).toHaveBeenCalledWith(
+        'account/sendActivationLink',
+        'test@test.com',
+      );
+    });
   });
 });