From 6d9a7d20dad34abdaaaff4efcd442a61bc7217cf Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Tue, 19 Nov 2019 01:34:19 +0900
Subject: [PATCH] Links and test changes
---
src/components/footer/www/footer.jsx | 4 ++--
src/routes.json | 10 ++++------
src/views/developers/developers.jsx | 2 +-
.../smoke-testing/test_footer_links.js | 4 ++--
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/components/footer/www/footer.jsx b/src/components/footer/www/footer.jsx
index ae31006c9..f533c8a3c 100644
--- a/src/components/footer/www/footer.jsx
+++ b/src/components/footer/www/footer.jsx
@@ -22,7 +22,7 @@ const Footer = props => (
-
+
@@ -83,7 +83,7 @@ const Footer = props => (
-
+
diff --git a/src/routes.json b/src/routes.json
index 3b6621946..e0dcefc3d 100644
--- a/src/routes.json
+++ b/src/routes.json
@@ -148,18 +148,16 @@
"title": "Ideas"
},
{
- "name": "jobs",
+ "name": "jobs-redirect",
"pattern": "^/jobs/?$",
"routeAlias": "/jobs(/moderator)?/?$",
- "view": "jobs/jobs",
- "title": "Jobs"
+ "redirect": "https://www.scratchfoundation.org/opportunities/"
},
{
- "name": "jobs-moderator",
+ "name": "jobs-redirect2",
"pattern": "^/jobs/moderator/?$",
"routeAlias": "/jobs(/moderator)?/?$",
- "view": "jobs/moderator/moderator",
- "title": "Community Moderator"
+ "redirect": "https://www.scratchfoundation.org/opportunities/"
},
{
"name": "join",
diff --git a/src/views/developers/developers.jsx b/src/views/developers/developers.jsx
index f1c967144..858fde3cb 100644
--- a/src/views/developers/developers.jsx
+++ b/src/views/developers/developers.jsx
@@ -228,7 +228,7 @@ const Developers = () => (
id="developers.joinBody"
values={{
jobsPageLink: (
-
+
),
diff --git a/test/integration-legacy/smoke-testing/test_footer_links.js b/test/integration-legacy/smoke-testing/test_footer_links.js
index 0fa9ed80e..5a49d87b6 100644
--- a/test/integration-legacy/smoke-testing/test_footer_links.js
+++ b/test/integration-legacy/smoke-testing/test_footer_links.js
@@ -101,9 +101,9 @@ tap.test('clickCreditsLink', options, t => {
// JOBS
tap.test('clickJobsLink', options, t => {
const linkText = 'Jobs';
- const expectedHref = '/jobs';
+ const expectedUrl = 'https://www.scratchfoundation.org/opportunities/';
clickFooterLinks(linkText).then(url => {
- t.equal(url.substr(-expectedHref.length), expectedHref);
+ t.equal(url, expectedUrl);
t.end();
});
});