Merge branch 'main' into 59-integration-tests (b7cfa450) · Commits · tomato / GrowBros · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

GrowBros
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

b7cfa450

Commit b7cfa450 authored 1 year ago by Blersch Lara

Downloads
- Plain Diff

Merge branch 'main' into 59-integration-tests

# Conflicts:
#	src/main/java/hdm/mi/growbros/models/WishListEntry.java

parents bbd29054 d93c9179

No related branches found

No related tags found

1 merge request!50Resolve "Integration tests"

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

README.md 8 additions, 0 deletions

README.md
growbros-frontend/index.html 3 additions, 3 deletions

growbros-frontend/index.html
growbros-frontend/public/recources/growbros_logo.png 0 additions, 0 deletions

growbros-frontend/public/recources/growbros_logo.png
growbros-frontend/src/pages/BackendConnectorTestInterface.tsx 5 additions, 3 deletions

...bros-frontend/src/pages/BackendConnectorTestInterface.tsx
growbros-frontend/src/pages/Home.tsx 78 additions, 78 deletions

growbros-frontend/src/pages/Home.tsx
growbros-frontend/src/pages/Suche.tsx 126 additions, 120 deletions

growbros-frontend/src/pages/Suche.tsx
growbros-frontend/src/stylesheets/Home.css 8 additions, 7 deletions

growbros-frontend/src/stylesheets/Home.css
src/main/java/hdm/mi/growbros/config/JpaConfiguration.java 2 additions, 0 deletions

src/main/java/hdm/mi/growbros/config/JpaConfiguration.java
src/test/java/hdm/mi/growbros/config/TestJpaAuditing.java 9 additions, 0 deletions

src/test/java/hdm/mi/growbros/config/TestJpaAuditing.java
src/test/java/hdm/mi/growbros/controllers/WishListControllerTest.java 69 additions, 0 deletions

...a/hdm/mi/growbros/controllers/WishListControllerTest.java
src/test/java/hdm/mi/growbros/repositories/WishListRepositoryTest.java 119 additions, 0 deletions

.../hdm/mi/growbros/repositories/WishListRepositoryTest.java
src/test/java/hdm/mi/growbros/service/WishListServiceTest.java 106 additions, 0 deletions

...est/java/hdm/mi/growbros/service/WishListServiceTest.java

with 533 additions and 211 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment