Update to latest ADF & alfresco-js-api (#264)

* upgrade to latest ADF & alfresco-js-api

* fix tests

* update to latest ADf alpha

package.json

@@ -17,8 +17,8 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "2.3.0-396d9104ee7b09aae5c63e60e4b4da0844a000f8",
+    "@alfresco/adf-content-services": "2.3.0-8f08528dc3858e28dd8c7cb3a8443603dde324b5",
-    "@alfresco/adf-core": "2.3.0-396d9104ee7b09aae5c63e60e4b4da0844a000f8",
+    "@alfresco/adf-core": "2.3.0-8f08528dc3858e28dd8c7cb3a8443603dde324b5",
     "@angular/animations": "5.1.1",
     "@angular/cdk": "5.0.1",
     "@angular/common": "5.1.1",
@@ -35,7 +35,7 @@
     "@mat-datetimepicker/core": "1.0.1",
     "@mat-datetimepicker/moment": "1.0.1",
     "@ngx-translate/core": "9.1.1",
-    "alfresco-js-api": "2.3.0-7186e9787152f396d8c6c6dc191578ac486a1986",
+    "alfresco-js-api": "2.3.0-a8fd3e442a61ccdeb94e562cb9d5e305341b2368",
     "core-js": "2.5.3",
     "hammerjs": "2.0.8",
     "moment-es6": "1.0.0",

src/app/common/directives/node-info.directive.spec.ts

@@ -55,10 +55,11 @@ describe('NodeInfoDirective', () => {
         fixture = TestBed.createComponent(TestComponent);
         component = fixture.componentInstance;
         apiService = TestBed.get(AlfrescoApiService);
-        nodeService = apiService.getInstance().nodes;
     }));
 
     beforeEach(() => {
+        nodeService = apiService.getInstance().nodes;
+
         spyOn(nodeService, 'getNodeInfo').and.returnValue(Promise.resolve({
             entry: { name: 'borg' }
         }));

src/app/common/directives/node-permanent-delete.directive.spec.ts

@@ -66,13 +66,14 @@ describe('NodePermanentDeleteDirective', () => {
             directiveInstance = element.injector.get(NodePermanentDeleteDirective);
 
             alfrescoService = TestBed.get(AlfrescoApiService);
-            nodesService = alfrescoService.getInstance().nodes;
             translation = TestBed.get(TranslationService);
             notificationService = TestBed.get(NotificationService);
         });
     }));
 
     beforeEach(() => {
+        nodesService = alfrescoService.getInstance().nodes;
+
         spyOn(translation, 'get').and.returnValue(Observable.of('message'));
         spyOn(notificationService, 'openSnackMessage').and.returnValue({});
     });

src/app/common/directives/node-restore.directive.spec.ts

@@ -74,8 +74,6 @@ describe('NodeRestoreDirective', () => {
             directiveInstance = element.injector.get(NodeRestoreDirective);
 
             alfrescoService = TestBed.get(AlfrescoApiService);
-            nodesService = alfrescoService.getInstance().nodes;
-            coreApi = alfrescoService.getInstance().core;
             translation = TestBed.get(TranslationService);
             notificationService = TestBed.get(NotificationService);
             router = TestBed.get(Router);
@@ -83,6 +81,9 @@ describe('NodeRestoreDirective', () => {
     }));
 
     beforeEach(() => {
+        nodesService = alfrescoService.getInstance().nodes;
+        coreApi = alfrescoService.getInstance().core;
+
         spyOn(translation, 'get').and.returnValue(Observable.of('message'));
     });
 

src/app/common/services/node-actions.service.spec.ts

@@ -135,6 +135,7 @@ describe('NodeActionsService', () => {
 
         service = TestBed.get(NodeActionsService);
         apiService = TestBed.get(AlfrescoApiService);
+        apiService.reset();
         nodesApiService = TestBed.get(NodesApiService);
         nodesApi = apiService.getInstance().nodes;
     });

src/app/components/favorites/favorites.component.spec.ts

@@ -130,6 +130,7 @@ describe('Favorites Routed Component', () => {
 
             nodesApi = TestBed.get(NodesApiService);
             alfrescoApi = TestBed.get(AlfrescoApiService);
+            alfrescoApi.reset();
             alfrescoContentService = TestBed.get(ContentService);
             contentService = TestBed.get(ContentManagementService);
             preferenceService = TestBed.get(UserPreferencesService);

src/app/components/libraries/libraries.component.spec.ts

@@ -113,6 +113,7 @@ describe('Libraries Routed Component', () => {
 
             nodesApi = TestBed.get(NodesApiService);
             alfrescoApi = TestBed.get(AlfrescoApiService);
+            alfrescoApi.reset();
             router = TestBed.get(Router);
             preferenceService = TestBed.get(UserPreferencesService);
         });

src/app/components/preview/preview.component.spec.ts

@@ -79,6 +79,7 @@ describe('PreviewComponent', () => {
             router = TestBed.get(Router);
             route = TestBed.get(ActivatedRoute);
             alfrescoApi = TestBed.get(AlfrescoApiService);
+            alfrescoApi.reset();
             preferences = TestBed.get(UserPreferencesService);
         });
     }));

src/app/components/recent-files/recent-files.component.spec.ts

@@ -112,6 +112,7 @@ describe('RecentFiles Routed Component', () => {
             contentService = TestBed.get(ContentManagementService);
             preferenceService = TestBed.get(UserPreferencesService);
             alfrescoApi = TestBed.get(AlfrescoApiService);
+            alfrescoApi.reset();
         });
     }));
 

src/app/components/shared-files/shared-files.component.spec.ts

@@ -110,6 +110,7 @@ describe('SharedFilesComponent', () => {
 
                 contentService = TestBed.get(ContentManagementService);
                 alfrescoApi = TestBed.get(AlfrescoApiService);
+                alfrescoApi.reset();
                 nodeService = alfrescoApi.getInstance().nodes;
                 preferenceService = TestBed.get(UserPreferencesService);
                 router = TestBed.get(Router);

src/app/components/trashcan/trashcan.component.spec.ts

@@ -106,6 +106,7 @@ describe('TrashcanComponent', () => {
             component = fixture.componentInstance;
 
             alfrescoApi = TestBed.get(AlfrescoApiService);
+            alfrescoApi.reset();
             contentService = TestBed.get(ContentManagementService);
             preferenceService = TestBed.get(UserPreferencesService);