Skip to content

Commit

Permalink
Merge pull request #5838 from sendilkumarn/update-angular
Browse files Browse the repository at this point in the history 
Update angular dependencies
  • Loading branch information
@sendilkumarn
sendilkumarn committed May 26, 2017
2 parents ecb14f9 + 537dc4e commit 133b266
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 70 deletions.
24 changes: 12 additions & 12 deletions generators/client/templates/angular/_package.json
View file
Expand Up @@ -25,15 +25,15 @@
"node_modules"
],
"dependencies": {
"@angular/common": "4.0.0",
"@angular/compiler": "4.0.0",
"@angular/core": "4.0.0",
"@angular/forms": "4.0.0",
"@angular/http": "4.0.0",
"@angular/platform-browser": "4.0.0",
"@angular/platform-browser-dynamic": "4.0.0",
"@angular/router": "4.0.0",
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.23",
"@angular/common": "4.1.3",
"@angular/compiler": "4.1.3",
"@angular/core": "4.1.3",
"@angular/forms": "4.1.3",
"@angular/http": "4.1.3",
"@angular/platform-browser": "4.1.3",
"@angular/platform-browser-dynamic": "4.1.3",
"@angular/router": "4.1.3",
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.26",
"angular2-cookie": "1.2.6",
"ngx-infinite-scroll": "0.4.1",
"bootstrap": "4.0.0-alpha.6",
Expand All @@ -50,11 +50,11 @@
"webstomp-client": "1.0.6",
<%_ } _%>
"tether": "1.4.0",
"zone.js": "0.8.5"
"zone.js": "0.8.11"
},
"devDependencies": {
"@angular/cli": "1.0.0",
"@angular/compiler-cli": "4.0.0",
"@angular/cli": "1.0.4",
"@angular/compiler-cli": "4.1.3",
"@types/jasmine": "2.5.47",
"@types/node": "7.0.12",
<%_ if (protractorTests) { _%>
Expand Down
7 changes: 2 additions & 5 deletions ...mplates/angular/src/test/javascript/spec/app/account/activate/_activate.component.spec.ts
View file
Expand Up @@ -46,11 +46,8 @@ describe('Component Tests', () => {
useValue: null
}
]
}).overrideComponent(ActivateComponent, {
set: {
template: ''
}
}).compileComponents();
}).overrideTemplate(ActivateComponent, '')
.compileComponents();
}));

beforeEach(() => {
Expand Down
7 changes: 2 additions & 5 deletions ...avascript/spec/app/account/password-reset/finish/_password-reset-finish.component.spec.ts
View file
Expand Up @@ -58,11 +58,8 @@ describe('Component Tests', () => {
useValue: new ElementRef(null)
}
]
}).overrideComponent(PasswordResetFinishComponent, {
set: {
template: ''
}
}).createComponent(PasswordResetFinishComponent);
}).overrideTemplate(PasswordResetFinishComponent, '')
.createComponent(PasswordResetFinishComponent);
comp = fixture.componentInstance;
});

Expand Down
7 changes: 2 additions & 5 deletions ...st/javascript/spec/app/account/password-reset/init/_password-reset-init.component.spec.ts
View file
Expand Up @@ -47,11 +47,8 @@ describe('Component Tests', () => {
useValue: new ElementRef(null)
}
]
}).overrideComponent(PasswordResetInitComponent, {
set: {
template: ''
}
}).createComponent(PasswordResetInitComponent);
}).overrideTemplate(PasswordResetInitComponent, '')
.createComponent(PasswordResetInitComponent);
comp = fixture.componentInstance;
comp.ngOnInit();
});
Expand Down
8 changes: 2 additions & 6 deletions ...ar/src/test/javascript/spec/app/account/password/_password-strength-bar.component.spec.ts
View file
Expand Up @@ -30,11 +30,8 @@ describe('Component Tests', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [PasswordStrengthBarComponent]
}).overrideComponent(PasswordStrengthBarComponent, {
set: {
template: ''
}
}).compileComponents();
}).overrideTemplate(PasswordStrengthBarComponent, '')
.compileComponents();
}));

beforeEach(() => {
Expand Down Expand Up @@ -68,4 +65,3 @@ describe('Component Tests', () => {
});
});
});

7 changes: 2 additions & 5 deletions ...mplates/angular/src/test/javascript/spec/app/account/password/_password.component.spec.ts
View file
Expand Up @@ -52,11 +52,8 @@ describe('Component Tests', () => {
<%_ } _%>
Password
]
}).overrideComponent(PasswordComponent, {
set: {
template: ''
}
}).compileComponents();
}).overrideTemplate(PasswordComponent, '')
.compileComponents();
}));

beforeEach(() => {
Expand Down
7 changes: 2 additions & 5 deletions ...mplates/angular/src/test/javascript/spec/app/account/register/_register.component.spec.ts
View file
Expand Up @@ -53,11 +53,8 @@ describe('Component Tests', () => {
useValue: null
}
]
}).overrideComponent(RegisterComponent, {
set: {
template: ''
}
}).compileComponents();
}).overrideTemplate(RegisterComponent, '')
.compileComponents();
}));

beforeEach(() => {
Expand Down
7 changes: 2 additions & 5 deletions ...mplates/angular/src/test/javascript/spec/app/account/sessions/_sessions.component.spec.ts
View file
Expand Up @@ -47,11 +47,8 @@ describe('Component Tests', () => {
useClass: MockPrincipal
}
]
}).overrideComponent(SessionsComponent, {
set: {
template: ''
}
}).createComponent(SessionsComponent);
}).overrideTemplate(SessionsComponent, '')
.createComponent(SessionsComponent);
comp = fixture.componentInstance;
});

Expand Down
7 changes: 2 additions & 5 deletions ...mplates/angular/src/test/javascript/spec/app/account/settings/_settings.component.spec.ts
View file
Expand Up @@ -67,11 +67,8 @@ describe('Component Tests', () => {
},
<%_ } _%>
]
}).overrideComponent(SettingsComponent, {
set: {
template: ''
}
}).compileComponents();
}).overrideTemplate(SettingsComponent, '')
.compileComponents();
}));

beforeEach(() => {
Expand Down
7 changes: 1 addition & 6 deletions ...ent/templates/angular/src/test/javascript/spec/app/admin/audits/_audits.component.spec.ts
View file
Expand Up @@ -62,12 +62,7 @@ describe('Component Tests', () => {
PaginationConfig,
DatePipe
]
})
.overrideComponent(AuditsComponent, {
set: {
template: ''
}
})
}).overrideTemplate(AuditsComponent, '')
.compileComponents();
}));

Expand Down
7 changes: 1 addition & 6 deletions ...ent/templates/angular/src/test/javascript/spec/app/admin/health/_health.component.spec.ts
View file
Expand Up @@ -42,12 +42,7 @@ describe('Component Tests', () => {
useValue: null
}
]
})
.overrideComponent(<%=jhiPrefixCapitalized%>HealthCheckComponent, {
set: {
template: ''
}
})
}).overrideTemplate(<%=jhiPrefixCapitalized%>HealthCheckComponent, '')
.compileComponents();
}));

Expand Down
7 changes: 2 additions & 5 deletions ...angular/src/test/javascript/spec/app/entities/_entity-management-detail.component.spec.ts
View file
Expand Up @@ -50,11 +50,8 @@ describe('Component Tests', () => {
<%= entityAngularName %>Service,
EventManager
]
}).overrideComponent(<%= entityAngularName %>DetailComponent, {
set: {
template: ''
}
}).compileComponents();
}).overrideTemplate(<%= entityAngularName %>DetailComponent, '')
.compileComponents();
}));

beforeEach(() => {
Expand Down

0 comments on commit 133b266

Please sign in to comment.