Closed JanneSickert closed 3 years ago
Merging #259 (c47f448) into master (862c62a) will increase coverage by
3.59%
. The diff coverage is70.71%
.
@@ Coverage Diff @@
## master #259 +/- ##
============================================
+ Coverage 68.28% 71.88% +3.59%
- Complexity 200 223 +23
============================================
Files 34 36 +2
Lines 864 939 +75
Branches 41 42 +1
============================================
+ Hits 590 675 +85
+ Misses 266 256 -10
Partials 8 8
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact)
,ø = not affected
,? = missing data
Powered by Codecov. Last update 862c62a...feef895. Read the comment docs.
I deleted the unnecessary @InjectMocks, make a new commit and merged the two commits to one. But something got wrong. Maybe my Git Bash commands will help.
Janne@DESKTOP-EST6JPQ MINGW64 ~/Desktop/MyHome (master)
$ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: service/src/test/java/com/myhome/controllers/HouseControllerTest.java
no changes added to commit (use "git add" and/or "git commit -a")
Janne@DESKTOP-EST6JPQ MINGW64 ~/Desktop/MyHome (master)
$ git add *
The following paths are ignored by one of your .gitignore files:
build
hint: Use -f if you really want to add them.
hint: Turn this message off by running
hint: "git config advice.addIgnoredFile false"
Janne@DESKTOP-EST6JPQ MINGW64 ~/Desktop/MyHome (master)
$ git commit -m "Issue #232: Move endpoints related to houses from community tag"
[master c47f448] Issue #232: Move endpoints related to houses from community tag
1 file changed, 3 deletions(-)
Janne@DESKTOP-EST6JPQ MINGW64 ~/Desktop/MyHome (master)
$ git push -u
Enumerating objects: 19, done.
Counting objects: 100% (19/19), done.
Delta compression using up to 8 threads
Compressing objects: 100% (8/8), done.
Writing objects: 100% (10/10), 810 bytes | 405.00 KiB/s, done.
Total 10 (delta 3), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To https://github.com/JanneSickert/MyHome.git
011ae35..c47f448 master -> master
Branch 'master' set up to track remote branch 'master' from 'origin'.
Janne@DESKTOP-EST6JPQ MINGW64 ~/Desktop/MyHome (master)
$ git rebase -i HEAD~10
[detached HEAD feef895] Issue #232: Move endpoints related to houses from community tag
Date: Wed Mar 10 20:32:41 2021 +0100
5 files changed, 287 insertions(+), 239 deletions(-)
Successfully rebased and updated refs/heads/master.
Janne@DESKTOP-EST6JPQ MINGW64 ~/Desktop/MyHome (master)
$ git log
commit feef895a55845d2a85efe1f3fb1b8c27fdcb434d (HEAD -> master)
Author: JanneSickert <janne.sickert@gmx.de>
Date: Wed Mar 10 20:32:41 2021 +0100
Issue #232: Move endpoints related to houses from community tag
* Issue #232: Move endpoints related to houses from community tag
commit 74eea96b17400102d157858302192c604ba80337
Author: JanneSickert <janne.sickert@gmx.de>
Date: Wed Mar 3 18:34:20 2021 +0100
Issue #233: Move endpoints related to amenities from community tag
commit 336ba50032b8d943fb455fd99a88af8fb3cf9ce4
Author: hsergiu <57728877+hsergiu@users.noreply.github.com>
Date: Sat Mar 6 15:49:34 2021 +0200
Issue #231: renamed test variable
commit f441caa5de491de57f685d5fc5fd3abb40b27c12
Author: hsergiu <57728877+hsergiu@users.noreply.github.com>
Date: Sat Mar 6 15:36:02 2021 +0200
Issue #231: Move endpoint related to payments from communities to payments
commit 57a6dd6998c583676e28c181b6e816a2e3d5b308
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Thu Feb 25 01:45:40 2021 +0300
Issue #196 fix test
commit 308eda08c44d4a6ed379f7b33cc1780031c7e9ef
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Thu Feb 25 01:45:25 2021 +0300
Issue #196 clean up
commit dafef5b6b6ac18c668cc77beb7f14e1be7542306
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Thu Feb 25 01:35:41 2021 +0300
Issue #196 restore locales and templates
commit 8fedbc2593623b6e31ffa84d09b9b22f77e38a47
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Thu Feb 25 01:21:35 2021 +0300
Issue #196 little fixes
commit 4b643edc745459a1caf1b1e94eb4a9035c655ef7
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Thu Feb 25 01:20:28 2021 +0300
Issue #196 fix email templates names
commit 157ff00754fdf063a5d009423f00d4d93c3cc2d9
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Wed Feb 24 23:32:15 2021 +0300
Issue #196 fix error
commit 46d23c6fb53117b8101594e1532fe2a54333eb0a
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Wed Feb 24 21:31:52 2021 +0300
Issue #196 rename mail prop
commit a95103c328a528bff1cf90e0f08a37e96ca52d8f
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Wed Feb 24 21:30:16 2021 +0300
Issue #196 fix tests
commit b6dd8be6205bd861576bf02ec0b6d8c7dd161e24
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Wed Feb 24 21:28:33 2021 +0300
Issue #196 separate Email properties to several classes
commit b694f0c9bc0b9753db735c912654b44e69182c2b
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Wed Feb 24 21:27:19 2021 +0300
Issue #196 turn `templateNames` from props to Enum
commit 63d02ed07ab136a99a7df8341297dd760691fcee
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Wed Feb 24 21:26:27 2021 +0300
Issue #196 mov `template` and `localization` outside spring.mail
commit 95394daf8c6c0925019cb8d3ebb1a09518e065d5
Author: Дмитроченков Даниил Андреевич <danya.dmit1@gmail.com>
Date: Tue Feb 23 00:29:08 2021 +0300
Issue #196 fix integration test
commit aadf84482f77fb9c1deaa5b89439b101174ac014
Janne@DESKTOP-EST6JPQ MINGW64 ~/Desktop/MyHome (master)
$ git push -f
Enumerating objects: 439, done.
Counting objects: 100% (439/439), done.
Delta compression using up to 8 threads
Compressing objects: 100% (217/217), done.
Writing objects: 100% (402/402), 59.37 KiB | 3.49 MiB/s, done.
Total 402 (delta 158), reused 216 (delta 92), pack-reused 0
remote: Resolving deltas: 100% (158/158), completed with 14 local objects.
To https://github.com/JanneSickert/MyHome.git
+ c47f448...feef895 master -> master (forced update)
Janne@DESKTOP-EST6JPQ MINGW64 ~/Desktop/MyHome (master)
$ git rebase master
Current branch master is up to date.
Janne@DESKTOP-EST6JPQ MINGW64 ~/Desktop/MyHome (master)
$ git push -f
Everything up-to-date
Janne@DESKTOP-EST6JPQ MINGW64 ~/Desktop/MyHome (master)
$
Closes: #232