DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-23 15:55:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #55 from cheapy-ispp/011-pruebas-unitarias-publicar-ofertas-abel

Browse source 
011 pruebas unitarias publicar ofertas abel
This commit is contained in:
abemorcardc 2021-04-03 13:08:38 +02:00 committed by GitHub
commit 1d60ba447e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/springframework/cheapy/web/NuOfferController.java
View file

@ -174,15 +174,15 @@ public class NuOfferController {
return NuOfferController.VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM;
} else {
if(!this.checkDates(nuOffer)) {
if(!this.checkDates(nuOfferEdit)) {
//Poner aqui mensaje de error
return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM;
}
if(!this.checkConditions(nuOffer)) {
if(!this.checkConditions(nuOfferEdit)) {
//Poner aqui mensaje de error
return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM;
}
if(!this.checkDiscounts(nuOffer)) {
if(!this.checkDiscounts(nuOfferEdit)) {
//Poner aqui mensaje de error
return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM;
}

6
src/main/java/org/springframework/cheapy/web/SpeedOfferController.java
View file

@ -167,15 +167,15 @@ public class SpeedOfferController {
return SpeedOfferController.VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM;
} else {
if(!this.checkDates(speedOffer)) {
if(!this.checkDates(speedOfferEdit)) {
//Poner aqui mensaje de error
return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM;
}
if(!this.checkConditions(speedOffer)) {
if(!this.checkConditions(speedOfferEdit)) {
//Poner aqui mensaje de error
return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM;
}
if(!this.checkDiscounts(speedOffer)) {
if(!this.checkDiscounts(speedOfferEdit)) {
//Poner aqui mensaje de error
return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM;
}

4
src/main/java/org/springframework/cheapy/web/TimeOfferController.java
View file

@ -165,11 +165,11 @@ public class TimeOfferController {
return TimeOfferController.VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM;
} else {
if(!this.checkDates(timeOffer)) {
if(!this.checkDates(timeOfferEdit)) {
//Poner aqui mensaje de error
return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM;
}
if(!this.checkTimes(timeOffer)) {
if(!this.checkTimes(timeOfferEdit)) {
//Poner aqui mensaje de error
return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM;
}

2
src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp
View file

@ -13,8 +13,6 @@
<form:form modelAttribute="foodOffer" class="form-horizontal">
<input type="hidden" name="food" value="${foodOffer.food}" />
<input type="hidden" name="discount" value="${foodOffer.discount}" />
<div class="btns-edit">
<button type="submit" style="font-family: 'Lobster'; font-size: 20px;">
<span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>

6
src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp
View file

@ -12,12 +12,6 @@
<h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
<form:form modelAttribute="nuOffer" class="form-horizontal">
<input type="hidden" name="gold" value="${nuOffer.gold}" />
<input type="hidden" name="discountGold" value="${nuOffer.discountGold}" />
<input type="hidden" name="silver" value="${nuOffer.silver}" />
<input type="hidden" name="discountSilver" value="${nuOffer.discountSilver}" />
<input type="hidden" name="bronze" value="${nuOffer.bronze}" />
<input type="hidden" name="discountBronze" value="${nuOffer.discountBronze}" />
<div class="btns-edit">
<button type="submit" style="font-family: 'Lobster'; font-size: 20px;">

7
src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp
View file

@ -13,13 +13,6 @@
<form:form modelAttribute="speedOffer" class="form-horizontal">
<input type="hidden" name="gold" value="${speedOffer.gold}" />
<input type="hidden" name="discountGold" value="${speedOffer.discountGold}" />
<input type="hidden" name="silver" value="${speedOffer.silver}" />
<input type="hidden" name="discountSilver" value="${speedOffer.discountSilver}" />
<input type="hidden" name="bronze" value="${speedOffer.bronze}" />
<input type="hidden" name="discountBronze" value="${speedOffer.discountBronze}" />
<div class="btns-edit">
<button type="submit" style="font-family: 'Lobster'; font-size: 20px;">
<span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>

3
src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp
View file

@ -12,9 +12,6 @@
<h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
<form:form modelAttribute="timeOffer" class="form-horizontal">
<input type="hidden" name="init" value="${timeOffer.init}" />
<input type="hidden" name="finish" value="${timeOffer.finish}" />
<input type="hidden" name="discount" value="${timeOffer.discount}" />
<div class="btns-edit">
<button type="submit" style="font-family: 'Lobster'; font-size: 20px;">

4
src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java
View file

@ -97,11 +97,11 @@ class NuOfferControllerTest {
.with(SecurityMockMvcRequestPostProcessors.csrf())
.param("start", "23/12/2021 12:30")
.param("end", "23/12/2022 12:30")
.param("gold", "5")
.param("gold", "15")
.param("discountGold", "15")
.param("silver", "10")
.param("discountSilver", "10")
.param("bronze", "15")
.param("bronze", "5")
.param("discountBronze", "5"))
.andExpect(status().is3xxRedirection());
}