Merge branch 'master' into ci/update-data-models

Author: nickevansuk

.github/workflows/quick-test.yml

@@ -1,8 +1,8 @@
 name: Code Tests
 
 on:
-  # This does not run on push to master, as tests will instead be run there as
-  # part of the test-and-publish workflow.
+  push:
+    branches: [ master ]
   pull_request:
     branches: [ master ]
 
@@ -20,5 +20,9 @@ jobs:
         node-version: 18.17.1
     - name: Install OpenActive Test Suite
       run: npm install
+    - name: Check licenses of all dependencies are at least permissive
+      run: |
+        npx npm-reflect install --test
+        for dir in ./packages/*; do (cd "$dir" && npx npm-reflect install --test); done
     - name: Run Checks on the Code (Test the Tests!)
       run: npm test

package.json

@@ -4,6 +4,7 @@
   "description": "OpenActive Test Suite",
   "private": true,
   "main": "start.js",
+  "license": "MIT",
   "scripts": {
     "start": "node start.js",
     "debug": "node --inspect start.js -- --runInBand",
@@ -57,5 +58,12 @@
     "hooks": {
       "pre-commit": "npm run gen-and-git-add-everything"
     }
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }

packages/openactive-broker-microservice/package.json

@@ -76,5 +76,12 @@
   },
   "engines": {
     "node": "18.17.1"
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }

packages/openactive-integration-tests/package.json

@@ -78,5 +78,12 @@
   },
   "engines": {
     "node": "18.17.1"
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }

packages/openactive-integration-tests/test/features/core/dataset-site/implemented/dataset-site-jsonld-valid-test.js

@@ -3,6 +3,8 @@ const chai = require('chai');
 const { FeatureHelper } = require('../../../../helpers/feature-helper');
 const { GetDatasetSite } = require('../../../../shared-behaviours');
 
+const { IMPLEMENTED_FEATURES } = global;
+
 FeatureHelper.describeFeature(module, {
   testCategory: 'core',
   testFeature: 'dataset-site',
@@ -32,5 +34,17 @@ function (configuration, orderItemCriteria, featureIsImplemented, logger) {
     it('should include accessService.endpointUrl that does not end in a trailing "/"', () => {
       chai.expect(getDatasetSite.datasetSite.body.accessService.endpointUrl).not.to.match(/\/$/g, 'a trailing /');
     });
+
+    if (IMPLEMENTED_FEATURES['booking-partner-openid-authentication'] === true) {
+      it('should include `accessService.authenticationAuthority`, as the "booking-partner-openid-authentication" feature is "true" in the config', () => {
+        chakram.expect(getDatasetSite.datasetSite).to.have.schema('accessService.authenticationAuthority', {
+          type: 'string',
+        });
+      });
+    } else if (IMPLEMENTED_FEATURES['booking-partner-openid-authentication'] === false) {
+      it('should not include `accessService.authenticationAuthority`, as the "booking-partner-openid-authentication" feature is "false" in the config', () => {
+        chai.expect(getDatasetSite.datasetSite.body.accessService).to.not.have.property('authenticationAuthority');
+      });
+    }
   });
 });

packages/openactive-openid-browser-automation/package.json

@@ -32,5 +32,12 @@
   },
   "engines": {
     "node": "18.17.1"
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }

packages/openactive-openid-client/package.json

@@ -30,5 +30,12 @@
   },
   "engines": {
     "node": "18.17.1"
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }

packages/openactive-openid-test-cli/package.json

@@ -33,5 +33,12 @@
   },
   "engines": {
     "node": "18.17.1"
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }