Merge branch 'master' into develop

scratchfoundation · Jan 29, 2025 · 104f74b · 104f74b
2 parents d31e705 + 80e0884
commit 104f74b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   build-and-test-and-maybe-deploy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     environment: >-
       ${{
         (
@@ -59,8 +59,8 @@ jobs:
       - name: setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '^3.5'
-      - run: pip install s3cmd==2.3.0
+          python-version: '3.12'
+      - run: pip install s3cmd==2.4.0
       - run: npm --production=false ci
       - run: mkdir -p ./test/results
       - name: lint

diff --git a/src/components/footer/www/footer.jsx b/src/components/footer/www/footer.jsx
@@ -184,6 +184,11 @@ const Footer = props => (
                             <FormattedMessage id="general.dsa" />
                         </a>
                     </dd>
+                    <dd>
+                        <a href="https://accessibility.mit.edu/">
+                            <FormattedMessage id="general.mitAccessibility" />
+                        </a>
+                    </dd>
                 </dl>
 
                 <dl>

diff --git a/src/l10n.json b/src/l10n.json
@@ -49,6 +49,7 @@
     "general.learnMore": "Learn More",
     "general.male": "Male",
     "general.messages": "Messages",
+    "general.mitAccessibility": "MIT Accessibility",
     "general.month": "Month",
     "general.monthJanuary": "January",
     "general.monthFebruary": "February",

diff --git a/test/integration/footer-links.test.js b/test/integration/footer-links.test.js
@@ -171,6 +171,13 @@ describe('www-integration footer links', () => {
         const pocTextVisible = await pocText.isDisplayed();
         expect(pocTextVisible).toBeTruthy();
     });
+
+    test('click MIT Accessibility link', async () => {
+        await clickText('MIT Accessibility');
+        await waitUntilDocumentReady();
+        const url = await driver.getCurrentUrl();
+        expect(url).toBe('https://accessibility.mit.edu/');
+    });
 });
 
 // The following links in the footer are skipped because they are not part of scratch-www
-Original file line number
+Diff line change
@@ Expand Up / @@ -184,6 +184,11 @@ const Footer = props => ( @@
                                 <FormattedMessage id="general.dsa" />
                             </a>
                         </dd>
+                        <dd>
+                            <a href="https://accessibility.mit.edu/">
+                                <FormattedMessage id="general.mitAccessibility" />
+                            </a>
+                        </dd>
                     </dl>
                     <dl>
@@ Expand Down @@