From 6ee9a2b35bf1dee8e64b9d7b1d86766b6505b3ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Tue, 27 Feb 2018 13:05:01 +0100
Subject: [PATCH] fixup! Fixed tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 apps/files_external/css/settings.scss        |  4 ----
 apps/files_external/js/settings.js           | 17 +++++++++--------
 apps/files_external/tests/js/settingsSpec.js |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/apps/files_external/css/settings.scss b/apps/files_external/css/settings.scss
index 09beaf1205..0f52ed3b2a 100644
--- a/apps/files_external/css/settings.scss
+++ b/apps/files_external/css/settings.scss
@@ -125,10 +125,6 @@ td.mountPoint, td.backend { width:160px; }
 	width: auto;
 }
 
-#externalStorage .mountOptionsDropdown {
-	margin-right: 40px;
-}
-
 .nav-icon-external-storage {
 	background-image: url('../img/app-dark.svg?v=1');
 }
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 0550cb04d8..99ee83d8a2 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -13,26 +13,27 @@
 // TODO: move to a separate file
 var MOUNT_OPTIONS_DROPDOWN_TEMPLATE =
 	'<div class="popovermenu open">'+
+	// FIXME: options are hard-coded for now
 	'	<ul>'+
-	'		<li>'+
+	'		<li class="optionRow">'+
 	'			<span class="menuitem">'+
 	'				<input id="mountOptionsEncrypt" class="checkbox" name="encrypt" type="checkbox" value="true" checked="checked"/>'+
 	'				<label for="mountOptionsEncrypt">{{t "files_external" "Enable encryption"}}</label>'+
 	'			</span>'+
 	'		</li>'+
-	'		<li>'+
+	'		<li class="optionRow">'+
 	'			<span class="menuitem">'+
 	'				<input id="mountOptionsPreviews" class="checkbox" name="previews" type="checkbox" value="true" checked="checked"/>'+
 	'				<label for="mountOptionsPreviews">{{t "files_external" "Enable previews"}}</label>'+
 	'			</span>'+
 	'		</li>'+
-	'		<li>'+
+	'		<li class="optionRow">'+
 	'			<span class="menuitem">'+
 	'				<input id="mountOptionsSharing" class="checkbox" name="enable_sharing" type="checkbox" value="true"/>'+
 	'				<label for="mountOptionsSharing">{{t "files_external" "Enable sharing"}}</label>'+
 	'			</span>'+
 	'		</li>'+
-	'		<li>'+
+	'		<li class="optionRow">'+
 	'			<span class="menuitem icon-search">'+
 	'				<label for="mountOptionsFilesystemCheck">{{t "files_external" "Check for changes"}}</label>'+
 	'				<select id="mountOptionsFilesystemCheck" name="filesystem_check_changes" data-type="int">'+
@@ -41,7 +42,7 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE =
 	'				</select>'+
 	'			</span>'+
 	'		</li>'+
-	'		<li>'+
+	'		<li class="optionRow">'+
 	'			<span class="menuitem">'+
 	'				<input id="mountOptionsEncoding" class="checkbox" name="encoding_compatibility" type="checkbox" value="true"/>'+
 	'				<label for="mountOptionsEncoding">{{mountOptionsEncodingLabel}}</label>'+
@@ -1303,9 +1304,9 @@ MountConfigListView.prototype = _.extend({
 			'enable_sharing',
 			'encoding_compatibility'
 		];
-		if (this._encryptionEnabled) {
-			visibleOptions.push('encrypt');
-		}
+		// if (this._encryptionEnabled) {
+		// 	visibleOptions.push('encrypt');
+		// }
 		dropDown.show($toggle, storage.mountOptions || [], visibleOptions);
 		$('body').on('mouseup.mountOptionsDropdown', function(event) {
 			var $target = $(event.target);
diff --git a/apps/files_external/tests/js/settingsSpec.js b/apps/files_external/tests/js/settingsSpec.js
index d68b2a5dd8..56bdcff834 100644
--- a/apps/files_external/tests/js/settingsSpec.js
+++ b/apps/files_external/tests/js/settingsSpec.js
@@ -213,7 +213,7 @@ describe('OCA.External.Settings tests', function() {
 				expect($mountOptionsField.length).toEqual(1);
 				$mountOptionsField.val(JSON.stringify({previews:true}));
 
-				var $saveButton = $tr.find('td.save .icon-save');
+				var $saveButton = $tr.find('td.save .icon-checkmark');
 				$saveButton.click();
 
 				expect(fakeServer.requests.length).toEqual(1);