Merge branch 'master' of github.com:backstage/backstage into RoadieHQ-5identity-api-client-interface

plugins/auth-node/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-node
 
+## 0.2.5-next.1
+
+### Patch Changes
+
+- 9212439d15: Minor update to tests
+- Updated dependencies
+  - @backstage/backend-common@0.15.1-next.1
+
 ## 0.2.5-next.0
 
 ### Patch Changes

plugins/auth-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-node",
-  "version": "0.2.5-next.0",
+  "version": "0.2.5-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,7 +23,7 @@
     "start": "backstage-cli package start"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.15.1-next.0",
+    "@backstage/backend-common": "^0.15.1-next.1",
     "@backstage/config": "^1.0.1",
     "@backstage/errors": "^1.1.0",
     "express": "^4.17.1",
@@ -33,7 +33,8 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.18.2-next.0",
+    "@backstage/backend-test-utils": "^0.1.28-next.1",
+    "@backstage/cli": "^0.19.0-next.1",
     "lodash": "^4.17.21",
     "msw": "^0.45.0",
     "uuid": "^8.0.0"

plugins/auth-node/src/IdentityClient.test.ts

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
+import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
 import {
   decodeProtectedHeader,
   exportJWK,
@@ -100,9 +102,7 @@ describe('IdentityClient', () => {
   let factory: FakeTokenFactory;
   const keyDurationSeconds = 5;
 
-  beforeAll(() => server.listen({ onUnhandledRequest: 'error' }));
-  afterAll(() => server.close());
-  afterEach(() => server.resetHandlers());
+  setupRequestMockHandlers(server);
 
   beforeEach(() => {
     client = IdentityClient.create({ discovery, issuer: mockBaseUrl });