From f78fb3e781ea5f14fa67a267adc419358f56269f Mon Sep 17 00:00:00 2001
From: Diana Barsan <barsan@medic.org>
Date: Wed, 19 Jul 2023 08:41:21 +0300
Subject: [PATCH] fix bad function reference

---
 api/src/db.js                                   |  3 ++-
 api/src/migrations/add-national_admin-role.js   |  4 ++--
 api/src/services/config-watcher.js              |  2 +-
 api/tests/mocha/services/config-watcher.spec.js | 16 ++++++++--------
 couchdb/10-docker-default.ini                   |  2 +-
 package.json                                    |  1 +
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/api/src/db.js b/api/src/db.js
index 67aac9ebde0..89dc303444d 100644
--- a/api/src/db.js
+++ b/api/src/db.js
@@ -42,7 +42,8 @@ if (UNIT_TEST_ENV) {
     'activeTasks',
     'saveDocs',
     'createVault',
-    'addRoleToSecurity',
+    'addRoleAsAdmin',
+    'addRoleAsMember',
   ];
 
   const notStubbed = (first, second) => {
diff --git a/api/src/migrations/add-national_admin-role.js b/api/src/migrations/add-national_admin-role.js
index a35ab4fbe1e..7eb43a9c247 100644
--- a/api/src/migrations/add-national_admin-role.js
+++ b/api/src/migrations/add-national_admin-role.js
@@ -7,7 +7,7 @@ module.exports = {
   created: new Date(2017, 3, 30),
   run: () => {
     return Promise.resolve()
-      .then(() => db.addRoleToSecurity('_users', 'national_admin'))
-      .then(() => db.addRoleToSecurity(environment.db, 'national_admin'));
+      .then(() => db.addRoleAsMember('_users', 'national_admin'))
+      .then(() => db.addRoleAsMember(environment.db, 'national_admin'));
   }
 };
diff --git a/api/src/services/config-watcher.js b/api/src/services/config-watcher.js
index d99d5cf03f8..2eda3f5ec86 100644
--- a/api/src/services/config-watcher.js
+++ b/api/src/services/config-watcher.js
@@ -189,7 +189,7 @@ const addUserRolesToDb = async () => {
   }
 
   for (const role of Object.keys(roles)) {
-    await db.addRoleToSecurity(environment.db, role, false);
+    await db.addRoleAsMember(environment.db, role);
   }
 };
 
diff --git a/api/tests/mocha/services/config-watcher.spec.js b/api/tests/mocha/services/config-watcher.spec.js
index 24ac930ef6c..f7eff615b8a 100644
--- a/api/tests/mocha/services/config-watcher.spec.js
+++ b/api/tests/mocha/services/config-watcher.spec.js
@@ -228,7 +228,7 @@ describe('Configuration', () => {
       it('reloads settings settings doc is updated', () => {
         settingsService.update.resolves();
         settingsService.get.resolves({ settings: 'yes' });
-        sinon.stub(db, 'addRoleToSecurity');
+        sinon.stub(db, 'addRoleAsMember');
         sinon.stub(config, 'get').withArgs('roles').returns({ chw: {} });
         sinon.stub(environment, 'db').get(() => 'medicdb');
 
@@ -238,14 +238,14 @@ describe('Configuration', () => {
           chai.expect(config.set.callCount).to.equal(1);
           chai.expect(config.set.args[0]).to.deep.equal([{ settings: 'yes' }]);
           chai.expect(config.get.withArgs('roles').callCount).to.equal(1);
-          chai.expect(db.addRoleToSecurity.args).to.deep.equal([['medicdb', 'chw', false]]);
+          chai.expect(db.addRoleAsMember.args).to.deep.equal([['medicdb', 'chw']]);
         });
       });
 
       it('should add all configured user roles to the main database', () => {
         settingsService.update.resolves();
         settingsService.get.resolves({ settings: 'yes' });
-        sinon.stub(db, 'addRoleToSecurity');
+        sinon.stub(db, 'addRoleAsMember');
         sinon.stub(config, 'get')
           .withArgs('roles')
           .returns({
@@ -262,11 +262,11 @@ describe('Configuration', () => {
           chai.expect(config.set.callCount).to.equal(1);
           chai.expect(config.set.args[0]).to.deep.equal([{ settings: 'yes' }]);
           chai.expect(config.get.withArgs('roles').callCount).to.equal(1);
-          chai.expect(db.addRoleToSecurity.args).to.deep.equal([
-            ['medicdb', 'chw1', false],
-            ['medicdb', 'chw2', false],
-            ['medicdb', 'chw3', false],
-            ['medicdb', 'chw4', false],
+          chai.expect(db.addRoleAsMember.args).to.deep.equal([
+            ['medicdb', 'chw1'],
+            ['medicdb', 'chw2'],
+            ['medicdb', 'chw3'],
+            ['medicdb', 'chw4'],
           ]);
         });
       });
diff --git a/couchdb/10-docker-default.ini b/couchdb/10-docker-default.ini
index 81bda3f518b..f61e6758b32 100644
--- a/couchdb/10-docker-default.ini
+++ b/couchdb/10-docker-default.ini
@@ -1,7 +1,7 @@
 ; couchdb/local.d/package.ini
 
 [fabric]
-request_timeout = 3600 ; 1 hour in seconds
+request_timeout = 31536000 ; 1 year in seconds
 
 [query_server_config]
 os_process_limit = 1000
diff --git a/package.json b/package.json
index bee318bd3e8..16b39ff6b0c 100755
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "standard-wdio-local": "export VERSION=$(node ./scripts/build/get-version.js) && grunt e2e-env-setup && wdio run ./tests/e2e/standard/wdio.conf.js",
     "default-wdio-mobile-local": "export VERSION=$(node ./scripts/build/get-version.js) && grunt e2e-env-setup && wdio run ./tests/e2e/default-mobile/wdio.conf.js",
     "e2e-integration": "mocha --config tests/integration/.mocharc.js ",
+    "e2e-integration-local": "export VERSION=$(node ./scripts/build/get-version.js) && grunt e2e-env-setup && mocha --config tests/integration/.mocharc.js ",
     "wdio": "wdio run ./tests/e2e/default/wdio.conf.js",
     "upgrade-wdio": "wdio run ./tests/e2e/upgrade/wdio.conf.js",
     "standard-wdio": "wdio run ./tests/e2e/standard/wdio.conf.js",