Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACA-2204] Upgrade to ADF 3.0.0 release #949

Merged
merged 2 commits into from
Feb 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "3.0.0-beta9",
"@alfresco/adf-core": "3.0.0-beta9",
"@alfresco/adf-extensions": "3.0.0-beta9",
"@alfresco/js-api": "3.0.0-beta9",
"@alfresco/adf-content-services": "3.0.0",
"@alfresco/adf-core": "3.0.0",
"@alfresco/adf-extensions": "3.0.0",
"@alfresco/js-api": "3.0.0",
"@angular/animations": "7.2.3",
"@angular/cdk": "^7.3.0",
"@angular/common": "7.2.3",
Expand Down
10 changes: 3 additions & 7 deletions src/app/components/context-menu/context-menu.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { Overlay } from '@angular/cdk/overlay';
import { Injector } from '@angular/core';
import { Store } from '@ngrx/store';
import { of } from 'rxjs';
import { AppConfigService } from '@alfresco/adf-core';
import { CoreModule } from '@alfresco/adf-core';
import { ContextMenuService } from './context-menu.service';
import { ContextMenuModule } from './context-menu.module';

Expand All @@ -42,12 +42,8 @@ describe('ContextMenuService', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [ContextMenuModule],
providers: [
Overlay,
{ provide: Store, useValue: { select: () => of() } },
{ provide: AppConfigService, useValue: {} }
]
imports: [CoreModule.forRoot(), ContextMenuModule],
providers: [Overlay, { provide: Store, useValue: { select: () => of() } }]
});

const injector = TestBed.get(Injector);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { DocumentListCustomComponentsModule } from '../document-list-custom-comp
import { Actions } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store';
import { TestBed } from '@angular/core/testing';
import { CoreModule } from '@alfresco/adf-core';

describe('CustomNameColumnComponent', () => {
let fixture;
Expand All @@ -36,6 +37,7 @@ describe('CustomNameColumnComponent', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot(),
DocumentListCustomComponentsModule,
StoreModule.forRoot({ app: () => {} }, { initialState: {} })
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe('AppNodeVersionFormComponent', () => {
let component;

setupTestBed({
imports: [CoreModule, NoopAnimationsModule],
imports: [CoreModule.forRoot(), NoopAnimationsModule],
declarations: [AppNodeVersionFormComponent]
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe('ToggleEditOfflineComponent', () => {
let dispatchSpy;

setupTestBed({
imports: [CoreModule],
imports: [CoreModule.forRoot()],
declarations: [ToggleEditOfflineComponent, LockNodeDirective],
providers: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe('ToggleFavoriteLibraryComponent', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [CoreModule, AppTestingModule],
imports: [CoreModule.forRoot(), AppTestingModule],
declarations: [ToggleFavoriteLibraryComponent, LibraryFavoriteDirective],
providers: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/directives/library-favorite.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ describe('LibraryFavoriteDirective', () => {
let selection;

setupTestBed({
imports: [CoreModule],
imports: [CoreModule.forRoot()],
declarations: [TestComponent, LibraryFavoriteDirective],
providers: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/directives/lock-node.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('LockNodeDirective', () => {
let component;

setupTestBed({
imports: [CoreModule],
imports: [CoreModule.forRoot()],
declarations: [TestComponent, LockNodeDirective],
providers: [
{
Expand Down