summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/files_encryption/l10n/fr.js1
-rw-r--r--apps/files_encryption/l10n/fr.json1
-rw-r--r--apps/files_sharing/js/external.js6
-rw-r--r--apps/files_sharing/tests/js/externalSpec.js122
4 files changed, 126 insertions, 4 deletions
diff --git a/apps/files_encryption/l10n/fr.js b/apps/files_encryption/l10n/fr.js
index bae11bf897e..64a600500eb 100644
--- a/apps/files_encryption/l10n/fr.js
+++ b/apps/files_encryption/l10n/fr.js
@@ -29,6 +29,7 @@ OC.L10N.register(
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Merci de vous assurer que OpenSSL et son extension PHP sont activés et configurés correctement. Pour l'instant, l'application de chiffrement a été désactivée.",
"Following users are not set up for encryption:" : "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
"Go directly to your %spersonal settings%s." : "Aller à %svos paramètres personnels%s.",
+ "Server-side Encryption" : "Chiffrement côté serveur",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
"Recovery key password" : "Mot de passe de la clef de récupération",
diff --git a/apps/files_encryption/l10n/fr.json b/apps/files_encryption/l10n/fr.json
index 5dc221691f0..1c64ab1f3c0 100644
--- a/apps/files_encryption/l10n/fr.json
+++ b/apps/files_encryption/l10n/fr.json
@@ -27,6 +27,7 @@
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Merci de vous assurer que OpenSSL et son extension PHP sont activés et configurés correctement. Pour l'instant, l'application de chiffrement a été désactivée.",
"Following users are not set up for encryption:" : "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
"Go directly to your %spersonal settings%s." : "Aller à %svos paramètres personnels%s.",
+ "Server-side Encryption" : "Chiffrement côté serveur",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
"Recovery key password" : "Mot de passe de la clef de récupération",
diff --git a/apps/files_sharing/js/external.js b/apps/files_sharing/js/external.js
index 31407f28ffd..a4bd3b45075 100644
--- a/apps/files_sharing/js/external.js
+++ b/apps/files_sharing/js/external.js
@@ -131,8 +131,10 @@
function(result, share) {
if (result) {
// Accept
- $.post(OC.generateUrl('/apps/files_sharing/api/externalShares'), {id: share.id});
- fileList.reload();
+ $.post(OC.generateUrl('/apps/files_sharing/api/externalShares'), {id: share.id})
+ .then(function() {
+ fileList.reload();
+ });
} else {
// Delete
$.ajax({
diff --git a/apps/files_sharing/tests/js/externalSpec.js b/apps/files_sharing/tests/js/externalSpec.js
index 2f8f4508d46..255f0fc3a48 100644
--- a/apps/files_sharing/tests/js/externalSpec.js
+++ b/apps/files_sharing/tests/js/externalSpec.js
@@ -31,7 +31,7 @@ describe('OCA.Sharing external tests', function() {
fileList: {
reload: sinon.stub()
}
- }
+ };
});
afterEach(function() {
urlQueryStub.restore();
@@ -118,6 +118,124 @@ describe('OCA.Sharing external tests', function() {
});
});
describe('show dialog for each share to confirm', function() {
- // TODO test plugin.processSharesToConfirm()
+ var testShare;
+
+ /**
+ * Call processSharesToConfirm() and make the fake server
+ * return the passed response.
+ *
+ * @param {Array} response list of shares to process
+ */
+ function processShares(response) {
+ plugin.processSharesToConfirm();
+
+ expect(fakeServer.requests.length).toEqual(1);
+
+ var req = fakeServer.requests[0];
+ expect(req.method).toEqual('GET');
+ expect(req.url).toEqual(OC.webroot + '/index.php/apps/files_sharing/api/externalShares');
+
+ req.respond(
+ 200,
+ {'Content-Type': 'application/json'},
+ JSON.stringify(response)
+ );
+ }
+
+ beforeEach(function() {
+ testShare = {
+ id: 123,
+ remote: 'http://example.com/owncloud',
+ token: 'abcdefg',
+ owner: 'theowner',
+ name: 'the share name'
+ };
+ });
+
+ it('does not show any dialog if no shares to confirm', function() {
+ processShares([]);
+ expect(confirmDialogStub.notCalled).toEqual(true);
+ expect(promptDialogStub.notCalled).toEqual(true);
+ });
+ it('sends accept info to server on confirm', function() {
+ processShares([testShare]);
+
+ expect(promptDialogStub.notCalled).toEqual(true);
+ expect(confirmDialogStub.calledOnce).toEqual(true);
+
+ confirmDialogStub.getCall(0).args[2](true);
+
+ expect(fakeServer.requests.length).toEqual(2);
+
+ var request = fakeServer.requests[1];
+ var query = OC.parseQueryString(request.requestBody);
+ expect(request.method).toEqual('POST');
+ expect(query).toEqual({id: '123'});
+ expect(request.url).toEqual(
+ OC.webroot + '/index.php/apps/files_sharing/api/externalShares'
+ );
+
+ expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true);
+ request.respond(
+ 200,
+ {'Content-Type': 'application/json'},
+ JSON.stringify({status: 'success'})
+ );
+ expect(plugin.filesApp.fileList.reload.calledOnce).toEqual(true);
+ });
+ it('sends delete info to server on cancel', function() {
+ processShares([testShare]);
+
+ expect(promptDialogStub.notCalled).toEqual(true);
+ expect(confirmDialogStub.calledOnce).toEqual(true);
+
+ confirmDialogStub.getCall(0).args[2](false);
+
+ expect(fakeServer.requests.length).toEqual(2);
+
+ var request = fakeServer.requests[1];
+ expect(request.method).toEqual('DELETE');
+ expect(request.url).toEqual(
+ OC.webroot + '/index.php/apps/files_sharing/api/externalShares/123'
+ );
+
+ expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true);
+ request.respond(
+ 200,
+ {'Content-Type': 'application/json'},
+ JSON.stringify({status: 'success'})
+ );
+ expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true);
+ });
+ xit('shows another dialog when multiple shares need to be accepted', function() {
+ // TODO: enable this test when fixing multiple dialogs issue / confirm loop
+ var testShare2 = _.extend({}, testShare);
+ testShare2.id = 256;
+ processShares([testShare, testShare2]);
+
+ // confirm first one
+ expect(confirmDialogStub.calledOnce).toEqual(true);
+ confirmDialogStub.getCall(0).args[2](true);
+
+ // next dialog not shown yet
+ expect(confirmDialogStub.calledOnce);
+
+ // respond to the first accept request
+ fakeServer.requests[1].respond(
+ 200,
+ {'Content-Type': 'application/json'},
+ JSON.stringify({status: 'success'})
+ );
+
+ // don't reload yet, there are other shares to confirm
+ expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true);
+
+ // cancel second share
+ expect(confirmDialogStub.calledTwice).toEqual(true);
+ confirmDialogStub.getCall(1).args[2](true);
+
+ // reload only called at the very end
+ expect(plugin.filesApp.fileList.reload.calledOnce).toEqual(true);
+ });
});
});
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 04:54:15 +0000