[RND-697] Refactor test to avoid race conditions on depending tests (#…

…334) * [RND-697] Refactor resource CRUD validation tests * v0.4.1-pre.1 * [RND-697] Refactor test for simplification --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Ed-Fi-Exchange-OSS · Dec 22, 2023 · d5d5534 · d5d5534
1 parent bc3f751
commit d5d5534
Show file tree

Hide file tree

Showing 13 changed files with 179 additions and 147 deletions.
diff --git a/Meadowlark-js/backends/meadowlark-elasticsearch-backend/package.json b/Meadowlark-js/backends/meadowlark-elasticsearch-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-elasticsearch-backend",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.0",
+  "version": "0.4.1-pre.1",
   "description": "Meadowlark backend plugin for elasticsearch",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -19,8 +19,8 @@
     "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
   },
   "dependencies": {
-    "@edfi/meadowlark-core": "0.4.1-pre.0",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.0",
+    "@edfi/meadowlark-core": "0.4.1-pre.1",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.1",
     "@elastic/elasticsearch": "^8.10.0",
     "@elastic/transport": "^8.3.4"
   },

diff --git a/Meadowlark-js/backends/meadowlark-mongodb-backend/package.json b/Meadowlark-js/backends/meadowlark-mongodb-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-mongodb-backend",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.0",
+  "version": "0.4.1-pre.1",
   "description": "Meadowlark backend plugin for MongoDB",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -19,9 +19,9 @@
     "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
   },
   "dependencies": {
-    "@edfi/meadowlark-authz-server": "0.4.1-pre.0",
-    "@edfi/meadowlark-core": "0.4.1-pre.0",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.0",
+    "@edfi/meadowlark-authz-server": "0.4.1-pre.1",
+    "@edfi/meadowlark-core": "0.4.1-pre.1",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.1",
     "async-retry": "^1.3.3",
     "mongodb": "^5.9.2",
     "ramda": "0.29.1"

diff --git a/Meadowlark-js/backends/meadowlark-opensearch-backend/package.json b/Meadowlark-js/backends/meadowlark-opensearch-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-opensearch-backend",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.0",
+  "version": "0.4.1-pre.1",
   "description": "Meadowlark backend plugin for OpenSearch",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -19,8 +19,8 @@
     "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
   },
   "dependencies": {
-    "@edfi/meadowlark-core": "0.4.1-pre.0",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.0",
+    "@edfi/meadowlark-core": "0.4.1-pre.1",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.1",
     "@opensearch-project/opensearch": "^2.4.0"
   },
   "devDependencies": {

diff --git a/Meadowlark-js/backends/meadowlark-postgresql-backend/package.json b/Meadowlark-js/backends/meadowlark-postgresql-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-postgresql-backend",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.0",
+  "version": "0.4.1-pre.1",
   "description": "Meadowlark backend plugin for PostgreSQL",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -19,9 +19,9 @@
     "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
   },
   "dependencies": {
-    "@edfi/meadowlark-authz-server": "0.4.1-pre.0",
-    "@edfi/meadowlark-core": "0.4.1-pre.0",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.0",
+    "@edfi/meadowlark-authz-server": "0.4.1-pre.1",
+    "@edfi/meadowlark-core": "0.4.1-pre.1",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.1",
     "pg": "^8.11.3",
     "pg-format": "^1.0.4",
     "ramda": "0.29.1"

diff --git a/Meadowlark-js/lerna.json b/Meadowlark-js/lerna.json
@@ -3,7 +3,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.4.1-pre.0",
+  "version": "0.4.1-pre.1",
   "npmClient": "npm",
   "useWorkspaces": true
 }
diff --git a/Meadowlark-js/package-lock.json b/Meadowlark-js/package-lock.json
diff --git a/Meadowlark-js/packages/meadowlark-authz-server/package.json b/Meadowlark-js/packages/meadowlark-authz-server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-authz-server",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.0",
+  "version": "0.4.1-pre.1",
   "description": "Meadowlark authorization server",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "@apideck/better-ajv-errors": "^0.3.6",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.0",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.1",
     "ajv": "^8.12.0",
     "didyoumean2": "^6.0.1",
     "dotenv": "^16.3.1",

diff --git a/Meadowlark-js/packages/meadowlark-core/package.json b/Meadowlark-js/packages/meadowlark-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-core",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.0",
+  "version": "0.4.1-pre.1",
   "description": "Meadowlark core functionality",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "@apideck/better-ajv-errors": "^0.3.6",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.0",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.1",
     "@isaacs/ttlcache": "^1.4.1",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",

diff --git a/Meadowlark-js/packages/meadowlark-utilities/package.json b/Meadowlark-js/packages/meadowlark-utilities/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@edfi/meadowlark-utilities",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.0",
+  "version": "0.4.1-pre.1",
   "description": "Meadowlark shared utilities",
   "license": "Apache-2.0",
   "publishConfig": {

diff --git a/Meadowlark-js/services/meadowlark-fastify/package.json b/Meadowlark-js/services/meadowlark-fastify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@edfi/meadowlark-fastify",
-  "version": "0.4.1-pre.0",
+  "version": "0.4.1-pre.1",
   "description": "Meadowlark service using Fastify",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -12,9 +12,9 @@
     "/package.json"
   ],
   "dependencies": {
-    "@edfi/meadowlark-authz-server": "0.4.1-pre.0",
-    "@edfi/meadowlark-core": "0.4.1-pre.0",
-    "@edfi/meadowlark-utilities": "0.4.1-pre.0",
+    "@edfi/meadowlark-authz-server": "0.4.1-pre.1",
+    "@edfi/meadowlark-core": "0.4.1-pre.1",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.1",
     "@fastify/rate-limit": "^6.0.1",
     "dotenv": "^16.3.1",
     "fastify": "^3.29.5"

diff --git a/Meadowlark-js/tests/e2e/helpers/Resources.ts b/Meadowlark-js/tests/e2e/helpers/Resources.ts
@@ -3,6 +3,7 @@
 // The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
 // See the LICENSE and NOTICES files in the project root for more information.
 
+import request from 'supertest';
 import { Role, getAccessToken } from './Credentials';
 import { baseURLRequest, rootURLRequest } from './Shared';
 
@@ -54,3 +55,9 @@ export async function deleteResourceByLocation(location: string, resourceName =
     console.warn(`⚠️ Unable to delete ${resourceName}. Location not found. Verify that resource was created correctly ⚠️`);
   }
 }
+
+export async function getResourceByLocation(location: string): Promise<request.Response> {
+  return rootURLRequest()
+    .get(location)
+    .auth(await getAccessToken('host'), { type: 'bearer' });
+}
diff --git a/Meadowlark-js/tests/e2e/package.json b/Meadowlark-js/tests/e2e/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@edfi/meadowlark-e2e-tests",
   "main": "dist/index.js",
-  "version": "0.4.1-pre.0",
+  "version": "0.4.1-pre.1",
   "description": "Meadowlark Ed-Fi API end to end tests",
   "license": "Apache-2.0",
   "private": true,
   "files": [],
   "devDependencies": {
-    "@edfi/meadowlark-utilities": "0.4.1-pre.0",
+    "@edfi/meadowlark-utilities": "0.4.1-pre.1",
     "@testcontainers/mongodb": "^10.3.1",
     "@testcontainers/postgresql": "^10.3.1",
     "@types/chance": "^1.1.6",