hostsharing/hs.hsadmin.ng
1
0
Fork 0
Code Activity

Merge branch 'jhipster-generated'

Browse Source 
# Conflicts:
#	src/main/java/org/hostsharing/hsadminng/domain/Asset.java
#	src/main/java/org/hostsharing/hsadminng/domain/Customer.java
#	src/main/java/org/hostsharing/hsadminng/domain/Membership.java
#	src/main/java/org/hostsharing/hsadminng/domain/Share.java
#	src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java
#	src/main/resources/config/liquibase/changelog/20190403083735_added_entity_Customer.xml
#	src/main/webapp/app/entities/customer/customer-detail.component.html
#	src/main/webapp/app/entities/customer/customer-update.component.html
#	src/main/webapp/app/entities/customer/customer.component.html
#	src/main/webapp/app/entities/entity.module.ts
#	src/test/java/org/hostsharing/hsadminng/web/rest/CustomerResourceIntTest.java
#	src/test/java/org/hostsharing/hsadminng/web/rest/ShareResourceIntTest.java
This commit is contained in:
Michael Hoennig
2019-04-12 16:47:18 +02:00
parent 39950f0d69 bd5bb859d9
commit 3fa514c982
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java
View File

@@ -114,6 +114,11 @@ public class AssetResourceIntTest {
.action(DEFAULT_ACTION) .action(DEFAULT_ACTION)
.amount(DEFAULT_AMOUNT) .amount(DEFAULT_AMOUNT)
.comment(DEFAULT_COMMENT); .comment(DEFAULT_COMMENT);
// Add required entity
Membership membership = MembershipResourceIntTest.createEntity(em);
em.persist(membership);
em.flush();
asset.setMember(membership);
return asset; return asset;
} }

5
src/test/java/org/hostsharing/hsadminng/web/rest/MembershipResourceIntTest.java
View File

@@ -108,6 +108,11 @@ public class MembershipResourceIntTest {
.customer(customer) .customer(customer)
.sinceDate(DEFAULT_SINCE_DATE) .sinceDate(DEFAULT_SINCE_DATE)
.untilDate(DEFAULT_UNTIL_DATE); .untilDate(DEFAULT_UNTIL_DATE);
// Add required entity
Customer customer = CustomerResourceIntTest.createEntity(em);
em.persist(customer);
em.flush();
membership.setCustomer(customer);
return membership; return membership;
} }

8
src/test/javascript/spec/app/entities/customer/customer.service.spec.ts
View File

@@ -1,11 +1,9 @@
/* tslint:disable max-line-length */ /* tslint:disable max-line-length */
import { TestBed, getTestBed } from '@angular/core/testing'; import { getTestBed, TestBed } from '@angular/core/testing';
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
import { HttpClient, HttpResponse } from '@angular/common/http'; import { map, take } from 'rxjs/operators';
import { of } from 'rxjs';
import { take, map } from 'rxjs/operators';
import { CustomerService } from 'app/entities/customer/customer.service'; import { CustomerService } from 'app/entities/customer/customer.service';
import { ICustomer, Customer } from 'app/shared/model/customer.model'; import { Customer, ICustomer } from 'app/shared/model/customer.model';
describe('Service Tests', () => { describe('Service Tests', () => {
describe('Customer Service', () => { describe('Customer Service', () => {