abstract demo server versions

OpenFn · Mar 22, 2021 · 7ee8a86 · 7ee8a86
1 parent 1c6400e
commit 7ee8a86
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 33 deletions.
diff --git a/test/ClientFixtures.js b/test/ClientFixtures.js
@@ -1,3 +1,6 @@
+const demoVersion = '2.35';
+const apiVersion = '35';
+
 const fixtures = {
   event: {
     requestBody: {
@@ -55,8 +58,8 @@ export const upsertNewState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     orgUnit: 'TSyzvBiovKh',
@@ -90,8 +93,8 @@ export const upsertExistingState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     orgUnit: 'TSyzvBiovKh',
@@ -125,8 +128,8 @@ export const upsertNewTEIState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     orgUnit: 'TSyzvBiovKh',
@@ -160,8 +163,8 @@ export const upsertExistingTEIState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     orgUnit: 'TSyzvBiovKh',
@@ -206,8 +209,8 @@ export const createEventsState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     program: 'eBAyeGv0exc',
@@ -241,8 +244,8 @@ export const sendDataForMultipleEventsState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     events: [
@@ -296,8 +299,8 @@ export const createState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     program: 'eBAyeGv0exc',
@@ -331,8 +334,8 @@ export const createBulkUnrelatedDataValues = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     dataValues: [
@@ -368,8 +371,8 @@ export const createRelatedDataValues = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     dataSet: 'pBOMPrpg1QX',
@@ -397,8 +400,8 @@ export const updateState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     id: 'FTRrcoaog83',
@@ -414,8 +417,8 @@ export const patchState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     name: 'Patched Name ' + Date.now(),
@@ -426,8 +429,8 @@ export const delState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     orgUnit: 'TSyzvBiovKh',
@@ -462,17 +465,17 @@ export const getState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
 };
 
 export const enrollTEIState = {
   configuration: {
     username: 'admin',
     password: 'district',
-    hostUrl: 'https://play.dhis2.org/2.35.1',
-    apiVersion: 35,
+    hostUrl: `https://play.dhis2.org/${demoVersion}`,
+    apiVersion,
   },
   data: {
     orgUnit: 'TSyzvBiovKh',
@@ -494,7 +497,7 @@ export const enrollTEIState = {
   },
 };
 
-export { fixtures };
+export { fixtures, demoVersion };
 
 export default [
   {

diff --git a/test/index.js b/test/index.js
@@ -36,6 +36,7 @@ import {
   createEventsState,
   sendDataForMultipleEventsState,
   enrollTEIState,
+  demoVersion,
 } from './ClientFixtures';
 import { permissions, userRoles, personAttributes } from './SetupFixtures';
 import { result } from 'lodash';
@@ -91,14 +92,15 @@ describe('execute', () => {
 });
 
 describe('live adaptor testing', () => {
+  console.log(demoVersion);
   // before ALL tests run, we must re-configure the dhis2 environment
   before(function () {
     this.timeout(30000);
     let state = {
       configuration: {
         username: 'admin',
         password: 'district',
-        hostUrl: 'https://play.dhis2.org/2.35.0',
+        hostUrl: `https://play.dhis2.org/${demoVersion}`,
       },
     };
 
@@ -145,7 +147,7 @@ describe('live adaptor testing', () => {
         configuration: {
           username: 'admin',
           password: 'district',
-          hostUrl: 'https://play.dhis2.org/2.35.0',
+          hostUrl: `https://play.dhis2.org/${demoVersion}`,
           apiVersion: 34,
         },
       };
@@ -162,7 +164,7 @@ describe('live adaptor testing', () => {
         configuration: {
           username: 'admin',
           password: 'district',
-          hostUrl: 'https://play.dhis2.org/2.35.0',
+          hostUrl: `https://play.dhis2.org/${demoVersion}`,
         },
       };
 
@@ -185,7 +187,7 @@ describe('live adaptor testing', () => {
         configuration: {
           username: 'admin',
           password: 'district',
-          hostUrl: 'https://play.dhis2.org/2.35.0',
+          hostUrl: `https://play.dhis2.org/${demoVersion}`,
         },
       };