Fix Features and DocTutorial tests (#520)

test/nbrowser/DocTutorial.ts

@@ -2,7 +2,8 @@ import {DocCreationInfo} from 'app/common/DocListAPI';
 import {UserAPI} from 'app/common/UserAPI';
 import {assert, driver, Key} from 'mocha-webdriver';
 import * as gu from 'test/nbrowser/gristUtils';
-import {setupTestSuite} from 'test/nbrowser/testUtils';
+import {server, setupTestSuite} from 'test/nbrowser/testUtils';
+import {EnvironmentSnapshot} from 'test/server/testUtils';
 
 describe('DocTutorial', function () {
   this.timeout(30000);
@@ -11,10 +12,14 @@ describe('DocTutorial', function () {
   let doc: DocCreationInfo;
   let api: UserAPI;
   let session: gu.Session;
+  let oldEnv: EnvironmentSnapshot;
 
   const cleanup = setupTestSuite({team: true});
 
   before(async () => {
+    oldEnv = new EnvironmentSnapshot();
+    process.env.GRIST_UI_FEATURES = 'tutorials';
+    await server.restart();
     session = await gu.session().teamSite.user('support').login();
     doc = await session.tempDoc(cleanup, 'DocTutorial.grist');
     api = session.createHomeApi();
@@ -25,6 +30,11 @@ describe('DocTutorial', function () {
     }});
   });
 
+  after(async function () {
+    oldEnv.restore();
+    await server.restart();
+  });
+
   describe('when logged out', function () {
     before(async () => {
       session = await gu.session().anon.login();

test/nbrowser/Features.ts

@@ -30,7 +30,7 @@ describe('Features', function () {
   });
 
   it('can be disabled with the GRIST_HIDE_UI_ELEMENTS env variable', async function () {
-    delete process.env.GRIST_UI_FEATURES;
+    process.env.GRIST_UI_FEATURES = 'helpCenter,tutorials';
     process.env.GRIST_HIDE_UI_ELEMENTS = 'templates';
     await server.restart();
     await session.loadDocMenu('/');
@@ -39,7 +39,7 @@ describe('Features', function () {
     assert.isFalse(await driver.find('.test-dm-templates-page').isDisplayed());
   });
 
-  it('that are disabled take precedence if also enabled', async function () {
+  it('that are disabled take precedence over those that are also enabled', async function () {
     process.env.GRIST_UI_FEATURES = 'tutorials,templates';
     process.env.GRIST_HIDE_UI_ELEMENTS = 'helpCenter,templates';
     await server.restart();