Merge c9afc98 into 5c2996d

nextcloud · Aug 6, 2018 · 4e6b0bf · 4e6b0bf
2 parents 5c2996d + c9afc98
commit 4e6b0bf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/js/app/service/calendarService.js b/js/app/service/calendarService.js
@@ -21,7 +21,7 @@
  *
  */
 
-app.service('CalendarService', function(DavClient, StringUtility, XMLUtility, CalendarFactory, isPublic, constants) {
+app.service('CalendarService', function(DavClient, StringUtility, XMLUtility, CalendarFactory, isPublic, constants, TimezoneService) {
 	'use strict';
 
 	const context = {
@@ -303,6 +303,10 @@ app.service('CalendarService', function(DavClient, StringUtility, XMLUtility, Ca
 				name: [DavClient.NS_DAV, 'd:displayname'],
 				value: name
 			});
+			dPropChildren.push({
+				name: [DavClient.NS_IETF, 'c:calendar-timezone'],
+				value: TimezoneService.getDetected()
+			});
 			dPropChildren.push({
 				name: [DavClient.NS_APPLE, 'a:calendar-color'],
 				value: color

diff --git a/tests/js/unit/services/calendarServiceSpec.js b/tests/js/unit/services/calendarServiceSpec.js
@@ -22,7 +22,7 @@
 describe('CalendarService non-public', function () {
 	'use strict';
 
-	let CalendarService, DavClient, StringUtility, XMLUtility, CalendarFactory, WebCal, $q, $rootScope, davService, constants;
+	let CalendarService, DavClient, StringUtility, XMLUtility, CalendarFactory, WebCal, $q, $rootScope, davService, constants, TimezoneService;
 	let firstPropFindDeferred, secondPropFindDeferred, thirdPropFindDeferred;
 	let firstRequestDeferred, secondRequestDeferred, thirdRequestDeferred;
 	let updateSpy;
@@ -735,13 +735,17 @@ END:VCALENDAR&#13;
 		OC.requestToken = 'requestToken42';
 		OC.linkToRemoteBase = jasmine.createSpy();
 
+		TimezoneService = {};
+		TimezoneService.getDetected = jasmine.createSpy();
+
 		$provide.value('DavClient', DavClient);
 		$provide.value('StringUtility', StringUtility);
 		$provide.value('XMLUtility', XMLUtility);
 		$provide.value('CalendarFactory', CalendarFactory);
 		$provide.value('WebCal', WebCal);
 		$provide.value('isPublic', false);
 		$provide.value('constants', {});
+		$provide.value('TimezoneService', TimezoneService);
 	}));
 
 	beforeEach(inject(function (_$q_, _$rootScope_) {
@@ -757,6 +761,7 @@ END:VCALENDAR&#13;
 		OC.linkToRemoteBase.and.returnValue('remote-dav');
 		DavClient.buildUrl.and.returnValues('fancy-url-1', 'fancy-url-2', 'fancy-url-3', 'fancy-url-4');
 		StringUtility.uri.and.returnValues('uri-1', 'uri-2', 'uri-3', 'uri-4');
+		TimezoneService.getDetected.and.returnValue('Europe/Berlin');
 
 		firstPropFindDeferred = $q.defer();
 		secondPropFindDeferred = $q.defer();
@@ -1089,6 +1094,9 @@ END:VCALENDAR&#13;
 		},{
 			name: ['DAV:', 'd:displayname'],
 			value: 'name-foobar-1337'
+		},{
+			name: ['urn:ietf:params:xml:ns:caldav', 'c:calendar-timezone'],
+			value: 'Europe/Berlin'
 		},{
 			name: ['http://apple.com/ns/ical/', 'a:calendar-color'],
 			value: '#eeeeee'
@@ -1357,7 +1365,7 @@ END:VCALENDAR&#13;
 describe('CalendarService - public', function() {
 	'use strict';
 
-	let CalendarService, DavClient, StringUtility, XMLUtility, CalendarFactory, WebCal, $q, $rootScope, davService, constants;
+	let CalendarService, DavClient, StringUtility, XMLUtility, CalendarFactory, WebCal, $q, $rootScope, davService, constants, TimezoneService;
 	let firstPropFindDeferred, secondPropFindDeferred, thirdPropFindDeferred;
 	let firstRequestDeferred, secondRequestDeferred, thirdRequestDeferred;
 
@@ -1515,13 +1523,17 @@ describe('CalendarService - public', function() {
 		OC.requestToken = 'requestToken42';
 		OC.linkToRemoteBase = jasmine.createSpy();
 
+		TimezoneService = {};
+		TimezoneService.getDetected = jasmine.createSpy();
+
 		$provide.value('DavClient', DavClient);
 		$provide.value('StringUtility', StringUtility);
 		$provide.value('XMLUtility', XMLUtility);
 		$provide.value('CalendarFactory', CalendarFactory);
 		$provide.value('WebCal', WebCal);
 		$provide.value('isPublic', true);
 		$provide.value('constants', {});
+		$provide.value('TimezoneService', TimezoneService);
 	}));
 
 	beforeEach(inject(function (_$q_, _$rootScope_) {
@@ -1536,6 +1548,7 @@ describe('CalendarService - public', function() {
 
 		OC.linkToRemoteBase.and.returnValue('remote-dav');
 		DavClient.buildUrl.and.returnValues('fancy-url-1', 'fancy-url-2', 'fancy-url-3', 'fancy-url-4');
+		TimezoneService.getDetected.and.returnValue('Europe/Berlin');
 
 		firstPropFindDeferred = $q.defer();
 		secondPropFindDeferred = $q.defer();