Merge branch 'master' into lesson-groups

Author: leslieyip02

MAINTENANCE.md

@@ -40,10 +40,19 @@ Reference PRs: [PR #3286](https://github.com/nusmodifications/nusmods/pull/3286)
 
 - Before
   - [ ] Update `TERM` in `scrapers/cpex-scraper/src/index.ts` and `MPE_SEMESTER` in `website/src/views/mpe/constants.ts` to be the semester you're configuring CPEx for (usually the next semester)
-  - [ ] Update the displayed dates in `website/src/views/mpe/MpeContainer.tsx` and any new requirements/descriptions
+  - [ ] ~~Update the displayed dates in `website/src/views/mpe/MpeContainer.tsx` and any new requirements/descriptions~~ Auto-updated using dates in modreg-schedule.json
   - [ ] Update dates in the ModReg schedule in `website/src/data/modreg-schedule.json`
   - [ ] Enable the `enableCPExforProd` and `showCPExTab` flags in `website/src/featureFlags.ts`
   - [ ] Push onto `cpex-staging` branch (Ensure synced with `master` branch first), then visit https://cpex-staging.nusmods.com/cpex and verify that NUS authentication is working
+
+```bash
+git checkout master
+git pull
+git switch cpex-staging
+git reset --hard master
+git push
+```
+
 - During
   - [ ] Merge `cpex-staging` into `master`
   - [ ] Deploy latest `master` to `production`

README.md

@@ -69,10 +69,10 @@ All projects and packages in this repository are [MIT licensed](LICENSE).
 
 [<img src="misc/1password-logo.png" width="200" />](1password)
 
-[Netlify](netlify) automatically deploys our branches so we can easily test incoming Pull Requests.
+[Vercel](vercel) hosts our website, and automatically deploys our branches so we can easily test incoming Pull Requests.
 
-[<img src="misc/netlify-logo.png" width="190" />](netlify)
+[<img src="misc/vercel-logo.png" width="200" />](vercel)
 
 [browserstack]: https://www.browserstack.com/
 [1password]: https://1password.com/
-[netlify]: https://www.netlify.com
+[vercel]: https://vercel.com/

misc/netlify-logo.png

@@ -4,7 +4,7 @@ import path from 'path';
 
 import env from '../env.json';
 
-const TERM = '2510';
+const TERM = '2520';
 
 // Sanity check to see if there are at least this many modules before overwriting cpexModules.json
 // The last time I ran this fully there were 3418 modules
@@ -86,8 +86,7 @@ async function scraper() {
     const department = departmentsData[i];
 
     console.log(
-      `[${i + 1}/${departmentsData.length}] Fetching modules for ${
-        department.Description
+      `[${i + 1}/${departmentsData.length}] Fetching modules for ${department.Description
       } with acadorg: ${department.AcademicOrganisation}...`,
     );
 

misc/vercel-logo.png

@@ -267,7 +267,9 @@ If a community libdef is not available, you can try writing your own and placing
 
 ### Testing and Linting
 
-We use [Jest][jest] with [Enzyme][enzyme] to test our code and React components, [TypeScript][ts] for typechecking, [Stylelint][stylelint] and [ESLint][eslint] using [Airbnb config][eslint-airbnb] and [Prettier][prettier] for linting and formatting.
+We use [Jest][jest] with [Enzyme][enzyme] and [Testing Library][testing-library] to test our code and React components, [TypeScript][ts] for typechecking, [Stylelint][stylelint] and [ESLint][eslint] using [Airbnb config][eslint-airbnb] and [Prettier][prettier] for linting and formatting.
+
+**Note: The majority of React tests are written with Enzyme. For new unit tests, please try to use [Testing Library][testing-library] instead!**
 
 ```sh
 # Run all tests once with code coverage
@@ -295,7 +297,7 @@ $ yarn typecheck
 
 We currently have some simple E2E tests set up courtesy of Browserstack using Nightwatch. The purpose of this is mainly to catch major regression in browsers at the older end of our browser support matrix (iOS 11, Safari 11, Edge, Firefox ESR) which can be difficult to test manually.
 
-By default the tests are ran against http://staging.nusmods.com, although they can be configured to run against any host, including localhost if you use [Browserstack's local testing feature](https://www.browserstack.com/local-testing#command-line).
+By default the tests are ran against http://latest.nusmods.com, although they can be configured to run against any host, including localhost if you use [Browserstack's local testing feature](https://www.browserstack.com/docs/automate/javascript-testing/local-testing).
 
 ```sh
 # All commands must include BROWSERSTACK_USER and BROWSERSTACK_ACCESS_KEY env variables
@@ -305,7 +307,7 @@ By default the tests are ran against http://staging.nusmods.com, although they c
 yarn e2e
 
 # Run against deploy preview
-LAUNCH_URL="https://deploy-preview-1024--nusmods.netlify.com" yarn e2e
+LAUNCH_URL="https://nusmods-website-example-modsbots-projects.vercel.app" yarn e2e
 
 # Run against local development server
 yarn start              # Start a local development server
@@ -404,6 +406,7 @@ Components should keep their styles and tests in the same directory with the sam
 [bootstrap]: https://getbootstrap.com/
 [jest]: https://facebook.github.io/jest/
 [enzyme]: http://airbnb.io/enzyme/
+[testing-library]: https://testing-library.com/docs/react-testing-library/intro/
 [ts]: https://www.typescriptlang.org/
 [eslint]: https://eslint.org/
 [svgr]: https://github.com/smooth-code/svgr

scrapers/cpex-scraper/src/index.ts

@@ -26,11 +26,11 @@ const handlePost: Handler = async (req, res) => {
 
     res.redirect(301, userURL.toString());
   } catch (err) {
-    if (err.message === errors.noRelayState) {
+    if ((err as unknown as Error).message === errors.noRelayState) {
       res.json({
         message: 'Relay state not found in request',
       });
-    } else if (err.message === errors.invalidRelayState) {
+    } else if ((err as unknown as Error).message === errors.invalidRelayState) {
       res.json({
         message: 'Invalid relay state given. URL must be from a valid domain.',
       });

website/README.md

@@ -31,11 +31,11 @@ const handleGet: Handler = async (req, res) => {
 
     res.send(createLoginURL(callback));
   } catch (err) {
-    if (err.message === errors.noCallbackUrl) {
+    if ((err as unknown as Error).message === errors.noCallbackUrl) {
       res.json({
         message: 'Request needs a referer',
       });
-    } else if (err.message === errors.invalidCallbackUrl) {
+    } else if ((err as unknown as Error).message === errors.invalidCallbackUrl) {
       res.json({
         message: 'Invalid referer given. URL must be from a valid domain.',
       });

website/api/nus/auth/login.ts

@@ -24,7 +24,7 @@ const handleGet: Handler = async (req, res) => {
     }));
     res.json(existingSubmission);
   } catch (err) {
-    if (err.response.status === 404) {
+    if ((err as any).response.status === 404) {
       res.json(<MpeSubmission>{
         intendedMCs: 0,
         preferences: [],

website/api/nus/auth/sso.ts

@@ -3,22 +3,26 @@ const config = {
   page_objects_path: 'src/e2e/page-objects',
   output_folder: 'reports/junit/e2e',
 
-  selenium: {
+  webdriver: {
     start_process: false,
     host: 'hub-cloud.browserstack.com',
-    port: 80,
+    port: 443,
+    ssl: true,
   },
 
   test_settings: {
     default: {
-      launch_url: process.env.LAUNCH_URL || 'http://staging.nusmods.com',
-      desiredCapabilities: {
-        'browserstack.user': process.env.BROWSERSTACK_USER,
-        'browserstack.key': process.env.BROWSERSTACK_ACCESS_KEY,
-        'browserstack.debug': true,
-        'browserstack.console': 'errors',
+      launch_url: process.env.LAUNCH_URL || 'http://latest.nusmods.com',
 
-        browser: 'Firefox',
+      desiredCapabilities: {
+        'bstack:options': {
+          userName: process.env.BROWSERSTACK_USER,
+          accessKey: process.env.BROWSERSTACK_ACCESS_KEY,
+          debug: true,
+          consoleLogs: 'errors'
+        },
+
+        browserName: 'Firefox',
         // Latest ESR
         browserVersion: '78',
       },
@@ -35,26 +39,20 @@ const config = {
     safariDesktop: {
       desiredCapabilities: {
         os: 'OS X',
-        browser: 'Safari',
+        browserName: 'Safari',
         browserVersion: '11.1',
       },
     },
 
     edge: {
-      browser: 'Edge',
+      browserName: 'Edge',
       browserVersion: '18.0',
     },
   },
 };
 
-// Copy seleniumhost/port into test settings
-Object.values(config.test_settings).forEach((setting) => {
-  setting.selenium_host = config.selenium.host;
-  setting.selenium_port = config.selenium.port;
-});
-
 if (process.env.LOCAL_TEST) {
-  config.test_settings.default.desiredCapabilities['browserstack.local'] = true;
+  config.test_settings.default.desiredCapabilities['bstack:options']['local'] = true;
 }
 
 module.exports = config;