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.

Sign up for GitHub

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

Jump to bottom

Pulls/778499123/64 #66

Merged
merged 66 commits into from
Feb 10, 2020
Merged

Pulls/778499123/64 #66

merged 66 commits into from
Feb 10, 2020

Conversation

Segelzwerg
Copy link
Owner

fix merge conflicts

Marcel added 30 commits December 16, 2019 18:41
Set theme jekyll-theme-slate
bce4c73
Add heroku.yml
4332f74
UPDATE: remote submodule
46ea72c
UPDATE: nav bar to heatmap for DE/EN
774dc18
TRY ADD: codecov integration
e524296
TRY UPDATE: build.gradle for codecov
bee7cc1
Update README.md
114f2ff 
ADD: codecov badge
ADD: test for miles construction and static method
91d754b
ADD: test for creating distance from miles and yards
e94a7a2
ADD: tests distance creation with nautical miles and fathoms
a0a67c3
ADD: test invalid major units
5aeeb98 
UPDATE: Distance change default behavior to throw exception if unit not found
ADD: Test for SpeedPresenter
ba2babb
ADD: Heatmap Context Loader
e50a1dc
UPDATE: set Kilometer and Meter as defaul units if null
2837061
ADD: SpeedServiceTest for only Kilometer
9d17a1a
ADD: test for invalid major unit
4b4946e 
REFACTOR: common setup in setup up method
ADD: test for invalid minor unit
444d9a1
ADD: Test for PacePresenter
3a48304
ADD: PaceServiceTest like the SpeedServiceTest 9d17a1a 4b4946e 444d9a1
b40b241
UPDATE: PaceService to use Kilometer and Meter on default if unit is …
680686c 
…invalid
FIX: float point precision in test
58c3352
ADD: TranslatorTest for English
e59454b
ADD: TranslatorTest for German
11ed546
Merge pull request #60 from Segelzwerg/increase_coverage
bd94c61 
Increase coverage
UPDATE: submodule
cd2168b
Removed submodule Heatmap-Provider
cf54852
ADD: result unit to SpeedForm
995147b
ADD: dynamic field getters for result unit
31b1c66
ADD: dynamic field getters for result unit
fe139bc 
FIX: thymeleaf tag
ADD: test for valid result units
64a8571
Marcel added 27 commits December 19, 2019 15:16
UPDATE: Translator to route all English language request to the main …
362d575 
…template
REMOVE: unsupported language templates
c53dbff
ADD: Controller Test for German mapping
89059ff
ADD: tool for posting forms from mock mvc
31caf5a
ADD: test for calculating speed
436f38b
REFACTOR: speed form build in setup
4cd5dcf
ADD: exlcude slow tests from test task
c19f341
UPDATE: slow tag for controller tests
b4e00ab
ADD: gradle task for slow tests
f22c8e3
UPDATE: slow test task configure for gradle check task
34eb8f6
UPDATE: gradle jacoco task to depend on test tasks
b04f6e2
TRY: integrate slow tests
586fc81
REVERT: slow tag
e0ab982 
due to codecov no recognizing these tests

This reverts commit c19f341.
Revert "UPDATE: slow tag for controller tests"

This reverts commit b4e00ab.
Revert "ADD: gradle task for slow tests"

This reverts commit f22c8e3.
Revert "UPDATE: slow test task configure for gradle check task"

This reverts commit 34eb8f6.
Revert "UPDATE: gradle jacoco task to depend on test tasks"

This reverts commit b04f6e2.
Revert "TRY: integrate slow tests"

This reverts commit 586fc81.
ADD: Pace Controller Tests
034a586
ADD: Test for index Heatmap Controller in English and German
87aa9ff
ADD: test for heatmap upload
aeca0ac 
UPDATE: make heatmapservice not final
ADD: generate tests
54b345e 
UPDATE: generate method to throw exception
UPDATE: error handling
2d540e8
ADD: get image test
18ef5f5
ADD: test for exception handling and
193e76f 
UPDATE: exception behavior
ADD: ImageService: it gets images from the server
99afb74
REFACTOR: image logic to service class in order to inject the service
93e7795
ADD: test for getting heatmap images
4259ba0
Merge branch 'master' into controller_tests
80dc6a6
Merge pull request #62 from Segelzwerg/controller_tests
966ea70 
Controller tests
Heroku setup
d2ddfa3 
# Conflicts:
#	Heatmap-Provider
#	heroku.yml
#	src/main/java/segelzwerg/sporttooolbox/web/heatmap/HeatMapController.java
REMOVE: merge error
361a77a
@codecov
Copy link

codecov bot commented Feb 10, 2020 •
edited
Loading

Codecov Report

Merging #66 into heroku_setup will decrease coverage by 0.96%.
The diff coverage is 0%.

Impacted file tree graph

@@                Coverage Diff                 @@
##             heroku_setup      #66      +/-   ##
==================================================
- Coverage           83.59%   82.62%   -0.97%     
  Complexity            129      129              
==================================================
  Files                  23       23              
  Lines                 256      259       +3     
  Branches               12       12              
==================================================
  Hits                  214      214              
- Misses                 34       37       +3     
  Partials                8        8
Impacted Files Coverage Δ Complexity Δ
...werg/sporttooolbox/web/heatmap/HeatMapService.java 7.14% <0%> (-0.86%) 1 <0> (ø)

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 966ea70...361a77a. Read the comment docs.

@Segelzwerg Segelzwerg merged commit fd5245a into heroku_setup Feb 10, 2020
@Segelzwerg Segelzwerg deleted the pulls/778499123/64 branch February 10, 2020 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Segelzwerg