From 648827003692fb16ab7b72afe61a38219d857d33 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Thu, 2 Feb 2017 00:26:04 +0900
Subject: [PATCH] Update tests for latest options

---
 test/specs/browser/settings_test.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/specs/browser/settings_test.js b/test/specs/browser/settings_test.js
index 6a2ebb55..855999a1 100644
--- a/test/specs/browser/settings_test.js
+++ b/test/specs/browser/settings_test.js
@@ -89,10 +89,10 @@ describe('browser/settings.html', function desc() {
       });
     });
 
-    describe('Allow mixed content', () => {
+    describe('Display secure content only', () => {
       [true, false].forEach((v) => {
         it(`should be saved and loaded: ${v}`, () => {
-          const webPreferences = v ? 'allowDisplayingInsecureContent' : '';
+          const webPreferences = v ? '' : 'allowDisplayingInsecureContent';
           env.addClientCommands(this.app.client);
 
           return this.app.client.
@@ -107,7 +107,7 @@ describe('browser/settings.html', function desc() {
             click('#btnSave').
             pause(1000).then(() => {
               const savedConfig = JSON.parse(fs.readFileSync(env.configFilePath, 'utf8'));
-              savedConfig.disablewebsecurity.should.equal(v);
+              savedConfig.disablewebsecurity.should.equal(!v);
             }).
             getAttribute('.mattermostView', 'webpreferences').then((disablewebsecurity) => { // confirm actual behavior
               // disablewebsecurity is an array of String
@@ -141,7 +141,7 @@ describe('browser/settings.html', function desc() {
       });
     });
 
-    describe('Show tray icon', () => {
+    describe('Show icon in menu bar / notification area', () => {
       it('should appear on darwin or linux', () => {
         const expected = (process.platform === 'darwin' || process.platform === 'linux');
         env.addClientCommands(this.app.client);
@@ -151,7 +151,7 @@ describe('browser/settings.html', function desc() {
       });
     });
 
-    describe('Minimize to tray', () => {
+    describe('Leave app running in notification area when application window is closed', () => {
       it('should appear on linux', () => {
         const expected = (process.platform === 'linux');
         env.addClientCommands(this.app.client);
@@ -171,7 +171,7 @@ describe('browser/settings.html', function desc() {
       });
     });
 
-    describe('Flash taskbar icon on new messages', () => {
+    describe('Flash taskbar icon when a new message is received', () => {
       it('should appear on win32 and linux', () => {
         const expected = (process.platform === 'win32' || process.platform === 'linux');
         env.addClientCommands(this.app.client);
@@ -181,7 +181,7 @@ describe('browser/settings.html', function desc() {
       });
     });
 
-    describe('Show red icon for unread', () => {
+    describe('Show red badge on taskbar icon to indicate unread messages', () => {
       it('should appear on darwin or win32', () => {
         const expected = (process.platform === 'darwin' || process.platform === 'win32');
         env.addClientCommands(this.app.client);