Combine save/load tests

test/specs/browser/settings_test.js

@@ -68,26 +68,8 @@ describe('browser/settings.html', function() {
       });
 
       [true, false].forEach(function(v) {
-        it(`should be loaded from config: ${v}`, function() {
+        it(`should be saved and loaded: ${v}`, function() {
           env.shouldTestForPlatforms(this, ['win32', 'linux']);
-          var new_config = {};
-          Object.assign(new_config, config);
-          new_config.hideMenuBar = v;
-          fs.writeFileSync(env.configFilePath, JSON.stringify(new_config));
-          return this.app.restart().then(() => {
-            addClientCommands(this.app.client);
-            return this.app.client
-              .loadSettingsPage()
-              .isSelected('#inputHideMenuBar input').should.eventually.equal(v)
-              .browserWindow.isMenuBarAutoHide().should.eventually.equal(v);
-          });
-        });
-      });
-
-      [true, false].forEach(function(v) {
-        it(`should be saved as config.json: ${v}`, function() {
-          env.shouldTestForPlatforms(this, ['win32', 'linux']);
-          return this.app.restart().then(() => {
           addClientCommands(this.app.client);
           return this.app.client
             .loadSettingsPage()
@@ -97,11 +79,20 @@ describe('browser/settings.html', function() {
               }
             })
             .click('#btnSave')
-              .pause(1000)
+            .pause(1000).then(() => {
-              .then(() => {
               const saved_config = JSON.parse(fs.readFileSync(env.configFilePath, 'utf8'));
               saved_config.hideMenuBar.should.equal(v);
-              });
+            })
+            // confirm actual behavior
+            .browserWindow.isMenuBarAutoHide().should.eventually.equal(v).then(() => {
+              return this.app.restart();
+            }).then(() => {
+              addClientCommands(this.app.client);
+              return this.app.client
+                // confirm actual behavior
+                .browserWindow.isMenuBarAutoHide().should.eventually.equal(v)
+                .loadSettingsPage()
+                .isSelected('#inputHideMenuBar input').should.eventually.equal(v);
             });
         });
       });
@@ -109,29 +100,7 @@ describe('browser/settings.html', function() {
 
     describe('Allow mixed content', function() {
       [true, false].forEach(function(v) {
-        it(`should be loaded from config: ${v}`, function() {
+        it(`should be saved and loaded: ${v}`, function() {
-          var new_config = {};
-          Object.assign(new_config, config);
-          new_config.disablewebsecurity = v;
-          fs.writeFileSync(env.configFilePath, JSON.stringify(new_config));
-          return this.app.restart().then(() => {
-            addClientCommands(this.app.client);
-            return this.app.client
-              .getAttribute('.mattermostView', 'disablewebsecurity').then((disablewebsecurity) => {
-                // disablewebsecurity is an array of String
-                disablewebsecurity.forEach((d) => {
-                  v.toString().should.equal(d)
-                })
-              })
-              .loadSettingsPage()
-              .isSelected('#inputDisableWebSecurity input').should.eventually.equal(v);
-          });
-        });
-      });
-
-      [true, false].forEach(function(v) {
-        it(`should be saved as config.json: ${v}`, function() {
-          return this.app.restart().then(() => {
           addClientCommands(this.app.client);
           return this.app.client
             .loadSettingsPage()
@@ -141,11 +110,30 @@ describe('browser/settings.html', function() {
               }
             })
             .click('#btnSave')
-              .pause(1000)
+            .pause(1000).then(() => {
-              .then(() => {
               const saved_config = JSON.parse(fs.readFileSync(env.configFilePath, 'utf8'));
               saved_config.disablewebsecurity.should.equal(v);
-              });
+            })
+            // confirm actual behavior
+            .getAttribute('.mattermostView', 'disablewebsecurity').then((disablewebsecurity) => {
+              // disablewebsecurity is an array of String
+              disablewebsecurity.forEach((d) => {
+                v.toString().should.equal(d);
+              })
+            }).then(() => {
+              return this.app.restart();
+            }).then(() => {
+              addClientCommands(this.app.client);
+              return this.app.client
+                // confirm actual behavior
+                .getAttribute('.mattermostView', 'disablewebsecurity').then((disablewebsecurity) => {
+                  // disablewebsecurity is an array of String
+                  disablewebsecurity.forEach((d) => {
+                    v.toString().should.equal(d);
+                  })
+                })
+                .loadSettingsPage()
+                .isSelected('#inputDisableWebSecurity input').should.eventually.equal(v);
             });
         });
       });