Skip to content

Commit 7e9d7a3

Browse files
committed
Clean up merge conflict resolution.
1 parent 9fc6d85 commit 7e9d7a3

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

test/unit/util/cloud-manager-hoc.test.jsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ describe('CloudManagerHOC', () => {
242242
expect(requestCloseConnection).toHaveBeenCalledTimes(1);
243243

244244
});
245-
245+
246246
test('project without cloud data should not trigger cloud connection', () => {
247247
// Mock the vm runtime function so that has cloud data is not
248248
// initially true
@@ -303,14 +303,12 @@ describe('CloudManagerHOC', () => {
303303
vm={vm}
304304
/>
305305
);
306-
306+
307307
vm.runtime.hasCloudData = jest.fn(() => false);
308308
vm.emit('HAS_CLOUD_DATA_UPDATE', false);
309-
309+
310310
expect(vm.setCloudProvider.mock.calls.length).toBe(2);
311311
expect(vm.setCloudProvider).toHaveBeenCalledWith(null);
312-
expect(requestCloseConnection).toHaveBeenCalledTimes(1);
313-
314312
});
315313

316314
// Editor Mode Connection/Disconnection Tests
@@ -338,7 +336,6 @@ describe('CloudManagerHOC', () => {
338336
expect(vm.setCloudProvider.mock.calls.length).toBe(2);
339337
expect(vm.setCloudProvider).toHaveBeenCalledWith(null);
340338
expect(requestCloseConnection).toHaveBeenCalledTimes(1);
341-
342339
});
343340

344341
test('Entering editor mode and can\'t save project should disconnect cloud provider # 2', () => {
@@ -364,6 +361,5 @@ describe('CloudManagerHOC', () => {
364361
expect(vm.setCloudProvider.mock.calls.length).toBe(2);
365362
expect(vm.setCloudProvider).toHaveBeenCalledWith(null);
366363
expect(requestCloseConnection).toHaveBeenCalledTimes(1);
367-
368364
});
369365
});

0 commit comments

Comments
 (0)