feat: activate the most recent view when closing a view

Closes #74

projects/e2e/workbench/src/view-tab-bar.e2e-spec.ts

@@ -11,11 +11,13 @@
 import { AppPO } from './page-object/app.po';
 import { browser } from 'protractor';
 import { WelcomePagePO } from './page-object/welcome-page.po';
+import { ViewNavigationPO } from './page-object/view-navigation.po';
 
 describe('ViewTabBar', () => {
 
   const appPO = new AppPO();
   const welcomePagePO = new WelcomePagePO();
+  const viewNavigationPO = new ViewNavigationPO();
 
   beforeEach(async () => {
     await browser.get('/');
@@ -48,4 +50,66 @@ describe('ViewTabBar', () => {
     await expect(appPO.getViewTabCount()).toEqual(0);
     await expect(appPO.isViewTabBarShowing()).toBeTruthy();
   });
+
+  it('should activate the most recent view when closing a view', async () => {
+    await viewNavigationPO.navigateTo();
+    await expect(appPO.getViewTabCount()).toEqual(1);
+
+    // open view-1
+    await viewNavigationPO.enterPath('view');
+    await viewNavigationPO.enterMatrixParams({viewCssClass: 'e2e-view-1', viewTitle: 'view-1'});
+    await viewNavigationPO.checkActivateIfPresent(true);
+    await viewNavigationPO.selectTarget('blank');
+    await viewNavigationPO.navigate();
+
+    await expect(appPO.findViewTab('e2e-view-1').isActive()).toBeTruthy();
+    await expect(appPO.getViewTabCount()).toEqual(2);
+
+    // open view-2
+    await viewNavigationPO.activateViewTab();
+    await viewNavigationPO.enterPath('view');
+    await viewNavigationPO.enterMatrixParams({viewCssClass: 'e2e-view-2', viewTitle: 'view-2'});
+    await viewNavigationPO.checkActivateIfPresent(true);
+    await viewNavigationPO.selectTarget('blank');
+    await viewNavigationPO.navigate();
+
+    await expect(appPO.findViewTab('e2e-view-2').isActive()).toBeTruthy();
+    await expect(appPO.getViewTabCount()).toEqual(3);
+
+    // open view-3
+    await viewNavigationPO.activateViewTab();
+    await viewNavigationPO.enterPath('view');
+    await viewNavigationPO.enterMatrixParams({viewCssClass: 'e2e-view-3', viewTitle: 'view-3'});
+    await viewNavigationPO.checkActivateIfPresent(true);
+    await viewNavigationPO.selectTarget('blank');
+    await viewNavigationPO.navigate();
+
+    await expect(appPO.findViewTab('e2e-view-3').isActive()).toBeTruthy();
+    await expect(appPO.getViewTabCount()).toEqual(4);
+
+    // activate view-2
+    await appPO.findViewTab('e2e-view-2').click();
+
+    await expect(appPO.findViewTab('e2e-view-2').isActive()).toBeTruthy();
+
+    // activate view-1
+    await appPO.findViewTab('e2e-view-1').click();
+
+    await expect(appPO.findViewTab('e2e-view-1').isActive()).toBeTruthy();
+
+    // activate view-3
+    await appPO.findViewTab('e2e-view-3').click();
+
+    await expect(appPO.findViewTab('e2e-view-3').isActive()).toBeTruthy();
+
+    // close view-3
+    await appPO.findViewTab('e2e-view-3').close();
+
+    await expect(appPO.findViewTab('e2e-view-1').isActive()).toBeTruthy();
+
+    // close view-1
+    await appPO.findViewTab('e2e-view-1').close();
+
+    await expect(appPO.findViewTab('e2e-view-2').isActive()).toBeTruthy();
+  });
 });

projects/scion/workbench-application-platform/src/lib/spec/manifest-collector.spec.ts

@@ -13,10 +13,10 @@ import { NgModule } from '@angular/core';
 import { WorkbenchApplicationPlatformModule } from '../workbench-application-platform.module';
 import { NullErrorHandler } from '../core/null-error-handler.service';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { WorkbenchModule } from '@scion/workbench';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ApplicationRegistry } from '../core/application-registry.service';
 import { ApplicationManifest } from '../core/metadata';
+import { WorkbenchTestingModule } from '@scion/workbench';
 
 describe('ManifestCollector', () => {
 
@@ -85,7 +85,7 @@ function createApplicationManifest(app: { appName: string }): ApplicationManifes
   imports: [
     HttpClientTestingModule,
     RouterTestingModule.withRoutes([]),
-    WorkbenchModule.forRoot(),
+    WorkbenchTestingModule.forRoot(),
     WorkbenchApplicationPlatformModule.forRoot({
       errorHandler: NullErrorHandler,
       applicationConfig: [

projects/scion/workbench-application-platform/src/lib/spec/workbench-application-platform.module.spec.ts

@@ -12,16 +12,16 @@ import { fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
 import { NgModule, NgModuleFactoryLoader } from '@angular/core';
 import { WorkbenchApplicationPlatformModule } from '../workbench-application-platform.module';
 import { NullErrorHandler } from '../core/null-error-handler.service';
-import { WorkbenchModule } from '@scion/workbench';
 import { RouterTestingModule, SpyNgModuleFactoryLoader } from '@angular/router/testing';
 import { Router } from '@angular/router';
+import { WorkbenchTestingModule } from '@scion/workbench';
 
 describe('WorkbenchApplicationPlatform', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
-        WorkbenchModule.forRoot(),
+        WorkbenchTestingModule.forRoot(),
         WorkbenchApplicationPlatformModule.forRoot({errorHandler: NullErrorHandler, applicationConfig: []}),
         RouterTestingModule.withRoutes([{path: 'lazy-module-forroot', loadChildren: './lazy-forroot.module'}]),
       ],

projects/scion/workbench/src/lib/spec/activities-from-lazy-loaded-modules.spec.ts

@@ -10,14 +10,14 @@
 
 import { async, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
 import { Component, NgModule, NgModuleFactoryLoader } from '@angular/core';
-import { WorkbenchModule } from '../workbench.module';
 import { expect, jasmineCustomMatchers } from './util/jasmine-custom-matchers.spec';
 import { RouterTestingModule, SpyNgModuleFactoryLoader } from '@angular/router/testing';
 import { Router, RouteReuseStrategy, RouterModule } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { advance, clickElement } from './util/util.spec';
 import { ActivityPartComponent } from '../activity-part/activity-part.component';
+import { WorkbenchTestingModule } from './workbench-testing.module';
 
 /**
  *
@@ -117,7 +117,7 @@ class AppComponent {
 
 @NgModule({
   imports: [
-    WorkbenchModule.forRoot(),
+    WorkbenchTestingModule.forRoot(),
     NoopAnimationsModule,
     RouterTestingModule.withRoutes([
       {path: 'feature-a', loadChildren: './feature-a/feature-a.module'},

projects/scion/workbench/src/lib/spec/activity-action.spec.ts

@@ -10,7 +10,6 @@
 
 import { async, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
 import { Component, NgModule } from '@angular/core';
-import { WorkbenchModule } from '../workbench.module';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Router, RouteReuseStrategy } from '@angular/router';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -19,6 +18,7 @@ import { expect, jasmineCustomMatchers } from './util/jasmine-custom-matchers.sp
 import { ActivityPartComponent } from '../activity-part/activity-part.component';
 import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
+import { WorkbenchTestingModule } from './workbench-testing.module';
 
 /**
  *
@@ -129,7 +129,7 @@ class Activity3Component {
 
 @NgModule({
   imports: [
-    WorkbenchModule.forRoot(),
+    WorkbenchTestingModule.forRoot(),
     NoopAnimationsModule,
     CommonModule,
     RouterTestingModule.withRoutes([

projects/scion/workbench/src/lib/spec/activity-guard.spec.ts

@@ -10,7 +10,6 @@
 
 import { async, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
 import { Component, Injectable, NgModule } from '@angular/core';
-import { WorkbenchModule } from '../workbench.module';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouteReuseStrategy, RouterStateSnapshot } from '@angular/router';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -20,6 +19,7 @@ import { ActivityPartComponent } from '../activity-part/activity-part.component'
 import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
 import { Observable } from 'rxjs';
+import { WorkbenchTestingModule } from './workbench-testing.module';
 
 /**
  *
@@ -126,7 +126,7 @@ class Activity2CanActivate implements CanActivate {
 
 @NgModule({
   imports: [
-    WorkbenchModule.forRoot(),
+    WorkbenchTestingModule.forRoot(),
     NoopAnimationsModule,
     CommonModule,
     RouterTestingModule.withRoutes([

projects/scion/workbench/src/lib/spec/activity.spec.ts

@@ -10,7 +10,6 @@
 
 import { async, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
 import { Component, NgModule, OnDestroy } from '@angular/core';
-import { WorkbenchModule } from '../workbench.module';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ActivatedRoute, ParamMap, Router, RouteReuseStrategy } from '@angular/router';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -20,6 +19,7 @@ import { Subject } from 'rxjs';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { distinctUntilChanged, map, takeUntil } from 'rxjs/operators';
 import { ActivityPartComponent } from '../activity-part/activity-part.component';
+import { WorkbenchTestingModule } from './workbench-testing.module';
 
 describe('Activity part', () => {
 
@@ -146,7 +146,7 @@ class Activity2Component {
 
 @NgModule({
   imports: [
-    WorkbenchModule.forRoot(),
+    WorkbenchTestingModule.forRoot(),
     NoopAnimationsModule,
     RouterTestingModule.withRoutes([
       {path: 'activity-debug', component: ActivityDebugComponent},

projects/scion/workbench/src/lib/spec/lazy-loaded-view-injection.spec.ts

@@ -10,7 +10,6 @@
 
 import { async, fakeAsync, inject, TestBed } from '@angular/core/testing';
 import { Component, Inject, Injectable, InjectionToken, NgModule, NgModuleFactoryLoader, Optional } from '@angular/core';
-import { WorkbenchModule } from '../workbench.module';
 import { expect, jasmineCustomMatchers } from './util/jasmine-custom-matchers.spec';
 import { RouterTestingModule, SpyNgModuleFactoryLoader } from '@angular/router/testing';
 import { Router, RouterModule } from '@angular/router';
@@ -20,6 +19,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { advance, clickElement } from './util/util.spec';
 import { ActivityPartComponent } from '../activity-part/activity-part.component';
 import { By } from '@angular/platform-browser';
+import { WorkbenchTestingModule } from './workbench-testing.module';
 
 /**
  *
@@ -144,7 +144,7 @@ export class FeatureService {
 
 @NgModule({
   imports: [
-    WorkbenchModule.forRoot(),
+    WorkbenchTestingModule.forRoot(),
     NoopAnimationsModule,
     RouterTestingModule.withRoutes([
       {path: 'feature', loadChildren: './feature/feature.module'},

projects/scion/workbench/src/lib/spec/route-resolve.spec.ts

@@ -11,14 +11,14 @@
 import { async, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
 import { Component, NgModule } from '@angular/core';
 import { ViewPartGridComponent } from '../view-part-grid/view-part-grid.component';
-import { WorkbenchModule } from '../workbench.module';
 import { expect, jasmineCustomMatchers } from './util/jasmine-custom-matchers.spec';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Router } from '@angular/router';
 import { InternalWorkbenchRouter, WorkbenchRouter } from '../routing/workbench-router.service';
 import { advance } from './util/util.spec';
 import { WorkbenchViewRegistry } from '../workbench-view-registry.service';
 import { WorkbenchView } from '../workbench.model';
+import { WorkbenchTestingModule } from './workbench-testing.module';
 
 describe('WbRouter', () => {
 
@@ -111,7 +111,7 @@ class ViewComponent {
 @NgModule({
   declarations: [ViewComponent],
   imports: [
-    WorkbenchModule.forRoot(),
+    WorkbenchTestingModule.forRoot(),
     RouterTestingModule.withRoutes([
       {path: 'path/to/view', component: ViewComponent},
       {path: 'path/to/view-1', component: ViewComponent},

projects/scion/workbench/src/lib/spec/router-navigate.spec.ts

@@ -10,14 +10,14 @@
 
 import { async, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
 import { Component, NgModule, NgModuleFactoryLoader } from '@angular/core';
-import { WorkbenchModule } from '../workbench.module';
 import { RouterTestingModule, SpyNgModuleFactoryLoader } from '@angular/router/testing';
 import { Router, RouterModule } from '@angular/router';
 import { WorkbenchRouter } from '../routing/workbench-router.service';
 import { CommonModule } from '@angular/common';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { advance, clickElement } from './util/util.spec';
 import { expect, jasmineCustomMatchers } from './util/jasmine-custom-matchers.spec';
+import { WorkbenchTestingModule } from './workbench-testing.module';
 
 /**
  * Testsetup:
@@ -306,7 +306,7 @@ class AppComponent {
 
 @NgModule({
   imports: [
-    WorkbenchModule.forRoot(),
+    WorkbenchTestingModule.forRoot(),
     NoopAnimationsModule,
     RouterTestingModule.withRoutes([
       {path: 'feature-a', loadChildren: './feature-a/feature-a.module'},
@@ -376,7 +376,7 @@ class FeatureA_View2Component {
 @NgModule({
   imports: [
     CommonModule,
-    WorkbenchModule.forChild(),
+    WorkbenchTestingModule.forChild(),
     RouterModule.forChild([
       {path: '', component: FeatureA_EntryComponent},
       {path: 'view-1', component: FeatureA_View1Component},
@@ -442,7 +442,7 @@ class FeatureB_View2Component {
 @NgModule({
   imports: [
     CommonModule,
-    WorkbenchModule.forChild(),
+    WorkbenchTestingModule.forChild(),
     RouterModule.forChild([
       {path: '', component: FeatureB_EntryComponent},
       {path: 'view-1', component: FeatureB_View1Component},

projects/scion/workbench/src/lib/spec/view-part-grid.component.spec.ts

@@ -11,13 +11,13 @@
 import { async, fakeAsync, inject, TestBed } from '@angular/core/testing';
 import { expect, jasmineCustomMatchers } from './util/jasmine-custom-matchers.spec';
 import { Component, NgModule } from '@angular/core';
-import { WorkbenchModule } from '../workbench.module';
 import { ViewPartGridComponent } from '../view-part-grid/view-part-grid.component';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { WorkbenchViewPartRegistry } from '../view-part-grid/workbench-view-part-registry.service';
 import { WorkbenchRouter } from '../routing/workbench-router.service';
 import { advance } from './util/util.spec';
+import { WorkbenchTestingModule } from './workbench-testing.module';
 
 describe('ViewPartGridComponent', () => {
 
@@ -504,7 +504,7 @@ class View3Component {
 @NgModule({
   declarations: [View1Component, View2Component, View3Component],
   imports: [
-    WorkbenchModule.forRoot(),
+    WorkbenchTestingModule.forRoot(),
     RouterTestingModule.withRoutes([
       {path: 'view-1', component: View1Component},
       {path: 'view-2', component: View2Component},