diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-09-24 12:21:19 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-09-24 12:21:19 +0200 |
| commit | 76e30d0df7c1b4b1f68ddd8596c4ab6d66bef366 (patch) | |
| tree | c6e36a3e5f0ac864ac56a66603ea67fb30972102 /core/js | |
| parent | 330ea18996f4f5bfcbaaebf641d6502757077c4d (diff) | |
| download | nextcloud-server-76e30d0df7c1b4b1f68ddd8596c4ab6d66bef366.tar.gz nextcloud-server-76e30d0df7c1b4b1f68ddd8596c4ab6d66bef366.zip | |
Expiration date was always a string
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/shareitemmodel.js | 2 | ||||
| -rw-r--r-- | core/js/tests/specs/shareitemmodelSpec.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js index d883497433f..db80a9aa76f 100644 --- a/core/js/shareitemmodel.js +++ b/core/js/shareitemmodel.js @@ -69,7 +69,7 @@ */ var SHARE_RESPONSE_INT_PROPS = [ 'id', 'file_parent', 'mail_send', 'file_source', 'item_source', 'permissions', - 'storage', 'share_type', 'parent', 'stime', 'expiration' + 'storage', 'share_type', 'parent', 'stime' ]; /** diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js index 07a6fbdc23f..a2f3d6fa0ad 100644 --- a/core/js/tests/specs/shareitemmodelSpec.js +++ b/core/js/tests/specs/shareitemmodelSpec.js @@ -169,7 +169,7 @@ describe('OC.Share.ShareItemModel', function() { /* jshint camelcase: false */ shares: [{ displayname_owner: 'root', - expiration: 1111, + expiration: '2015-10-12 00:00:00', file_source: 123, file_target: '/folder', id: 20, @@ -187,7 +187,7 @@ describe('OC.Share.ShareItemModel', function() { uid_owner: 'root' }, { displayname_owner: 'root', - expiration: 2222, + expiration: '2015-10-15 00:00:00', file_source: 456, file_target: '/file_in_folder.txt', id: 21, @@ -263,7 +263,7 @@ describe('OC.Share.ShareItemModel', function() { reshare: {}, shares: [{ displayname_owner: 'root', - expiration: '1403900000', + expiration: '2015-10-12 00:00:00', file_source: '123', file_target: '/folder', id: '20', @@ -301,7 +301,7 @@ describe('OC.Share.ShareItemModel', function() { expect(share.share_type).toEqual(OC.Share.SHARE_TYPE_USER); expect(share.share_with).toEqual('user1'); expect(share.stime).toEqual(1403884258); - expect(share.expiration).toEqual(1403900000); + expect(share.expiration).toEqual('2015-10-12 00:00:00'); }); }); |