Fix javascript tests

Signed-off-by: Roeland Jago Douma <[email protected]>
nextcloud · Oct 19, 2016 · 92788cc · 92788cc
1 parent 3b02a74
commit 92788cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 37 deletions.
diff --git a/core/js/tests/specs/sharedialogshareelistview.js b/core/js/tests/specs/sharedialogshareelistview.js
@@ -34,8 +34,6 @@ describe('OC.Share.ShareDialogShareeListView', function () {
 		oldAppConfig = _.extend({}, oc_appconfig.core);
 		oc_appconfig.core.enforcePasswordForPublicLink = false;
 
-		$('#testArea').append('<input id="mailNotificationEnabled" name="mailNotificationEnabled" type="hidden" value="yes">');
-
 		fileInfoModel = new OCA.Files.FileInfoModel({
 			id: 123,
 			name: 'shared_file_name.txt',
@@ -139,23 +137,6 @@ describe('OC.Share.ShareDialogShareeListView', function () {
 			listView.$el.find('a.showCruds').click();
 			expect(listView.$el.find('li.cruds').hasClass('hidden')).toEqual(false);
 		});
-
-		it('sends notification to user when checkbox clicked', function () {
-			shareModel.set('shares', [{
-				id: 100,
-				item_source: 123,
-				permissions: 1,
-				share_type: OC.Share.SHARE_TYPE_USER,
-				share_with: 'user1',
-				share_with_displayname: 'User One'
-			}]);
-			listView.render();
-			var notificationStub = sinon.stub(listView.model, 'sendNotificationForShare');
-			listView.$el.find("input[name='mailNotification']").click();
-			expect(notificationStub.called).toEqual(true);
-			notificationStub.restore();
-		});
-
 	});
 
 });
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
@@ -494,18 +494,12 @@ describe('OC.Share.ShareItemModel', function() {
 
 			expect(res.state()).toEqual('pending');
 			expect(fakeServer.requests.length).toEqual(1);
-			expect(fakeServer.requests[0].url).toEqual(OC.generateUrl('core/ajax/share.php'));
+			expect(fakeServer.requests[0].url).toEqual(OC.linkToOCS('apps/files_sharing/api/v1', 2) + 'shares/20/emailLink?format=json');
 			expect(OC.parseQueryString(fakeServer.requests[0].requestBody)).toEqual(
 				{
-					action: 'email',
 					toaddress: '[email protected]',
-					link: model.get('linkShare').link,
-					itemType: 'file',
-					itemSource: '123',
-					file: 'shared_file_name.txt',
-					expiration: ''
 				}
-			)
+			);
 
 			fakeServer.requests[0].respond(
 				200,
@@ -544,21 +538,15 @@ describe('OC.Share.ShareItemModel', function() {
 
 			expect(res.state()).toEqual('pending');
 			expect(fakeServer.requests.length).toEqual(1);
-			expect(fakeServer.requests[0].url).toEqual(OC.generateUrl('core/ajax/share.php'));
+			expect(fakeServer.requests[0].url).toEqual(OC.linkToOCS('apps/files_sharing/api/v1', 2) + 'shares/20/emailLink?format=json');
 			expect(OC.parseQueryString(fakeServer.requests[0].requestBody)).toEqual(
 				{
-					action: 'email',
-					toaddress: '[email protected]',
-					link: model.get('linkShare').link,
-					itemType: 'file',
-					itemSource: '123',
-					file: 'shared_file_name.txt',
-					expiration: ''
+					toaddress: '[email protected]'
 				}
-			)
+			);
 
 			fakeServer.requests[0].respond(
-				200,
+				403,
 				{ 'Content-Type': 'application/json' },
 				JSON.stringify({data: {message: 'fail'}, status: 'error'})
 			);