libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #5204 from pedroigor/KEYCLOAK-7360

Browse source 
[KEYCLOAK-7360] - Both time and rules policy not showing number fields
This commit is contained in:
Pedro Igor 2018-05-22 08:12:43 -03:00 committed by GitHub
commit a8319d1131
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/authorization/TimePolicyManagementTest.java
View file

@ -20,10 +20,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import org.junit.Test; import org.junit.Test;
import org.keycloak.representations.idm.authorization.JSPolicyRepresentation;
import org.keycloak.representations.idm.authorization.Logic; import org.keycloak.representations.idm.authorization.Logic;
import org.keycloak.representations.idm.authorization.TimePolicyRepresentation; import org.keycloak.representations.idm.authorization.TimePolicyRepresentation;
import org.keycloak.testsuite.console.page.clients.authorization.policy.JSPolicy;
import org.keycloak.testsuite.console.page.clients.authorization.policy.TimePolicy; import org.keycloak.testsuite.console.page.clients.authorization.policy.TimePolicy;
/** /**
@ -32,14 +30,14 @@ import org.keycloak.testsuite.console.page.clients.authorization.policy.TimePoli
public class TimePolicyManagementTest extends AbstractAuthorizationSettingsTest { public class TimePolicyManagementTest extends AbstractAuthorizationSettingsTest {
@Test @Test
public void testUpdate() throws InterruptedException { public void testUpdate() {
authorizationPage.navigateTo(); authorizationPage.navigateTo();
TimePolicyRepresentation expected = new TimePolicyRepresentation(); TimePolicyRepresentation expected = new TimePolicyRepresentation();
expected.setName("Test Time Policy"); expected.setName("Test Time Policy");
expected.setDescription("description"); expected.setDescription("description");
expected.setNotBefore("2017-01-01 00:00:00"); expected.setNotBefore("2017-01-01 00:00:00");
expected.setNotBefore("2018-01-01 00:00:00"); expected.setNotOnOrAfter("2018-01-01 00:00:00");
expected.setDayMonth("1"); expected.setDayMonth("1");
expected.setDayMonthEnd("2"); expected.setDayMonthEnd("2");
expected.setMonth("3"); expected.setMonth("3");
@ -59,7 +57,7 @@ public class TimePolicyManagementTest extends AbstractAuthorizationSettingsTest
expected.setDescription("Changed description"); expected.setDescription("Changed description");
expected.setLogic(Logic.NEGATIVE); expected.setLogic(Logic.NEGATIVE);
expected.setNotBefore("2018-01-01 00:00:00"); expected.setNotBefore("2018-01-01 00:00:00");
expected.setNotBefore("2019-01-01 00:00:00"); expected.setNotOnOrAfter("2019-01-01 00:00:00");
expected.setDayMonth("23"); expected.setDayMonth("23");
expected.setDayMonthEnd("25"); expected.setDayMonthEnd("25");
expected.setMonth("11"); expected.setMonth("11");
@ -82,14 +80,14 @@ public class TimePolicyManagementTest extends AbstractAuthorizationSettingsTest
} }
@Test @Test
public void testDelete() throws InterruptedException { public void testDelete() {
authorizationPage.navigateTo(); authorizationPage.navigateTo();
TimePolicyRepresentation expected = new TimePolicyRepresentation(); TimePolicyRepresentation expected = new TimePolicyRepresentation();
expected.setName("Test Time Policy"); expected.setName("Test Time Policy");
expected.setDescription("description"); expected.setDescription("description");
expected.setNotBefore("2017-01-01 00:00:00"); expected.setNotBefore("2017-01-01 00:00:00");
expected.setNotBefore("2018-01-01 00:00:00"); expected.setNotOnOrAfter("2018-01-01 00:00:00");
expected.setDayMonth("1"); expected.setDayMonth("1");
expected.setDayMonthEnd("2"); expected.setDayMonthEnd("2");
expected.setMonth("3"); expected.setMonth("3");
@ -110,14 +108,14 @@ public class TimePolicyManagementTest extends AbstractAuthorizationSettingsTest
} }
@Test @Test
public void testDeleteFromList() throws InterruptedException { public void testDeleteFromList() {
authorizationPage.navigateTo(); authorizationPage.navigateTo();
TimePolicyRepresentation expected = new TimePolicyRepresentation(); TimePolicyRepresentation expected = new TimePolicyRepresentation();
expected.setName("Test Time Policy"); expected.setName("Test Time Policy");
expected.setDescription("description"); expected.setDescription("description");
expected.setNotBefore("2017-01-01 00:00:00"); expected.setNotBefore("2017-01-01 00:00:00");
expected.setNotBefore("2018-01-01 00:00:00"); expected.setNotOnOrAfter("2018-01-01 00:00:00");
expected.setDayMonth("1"); expected.setDayMonth("1");
expected.setDayMonthEnd("2"); expected.setDayMonthEnd("2");
expected.setMonth("3"); expected.setMonth("3");
@ -148,6 +146,18 @@ public class TimePolicyManagementTest extends AbstractAuthorizationSettingsTest
assertEquals(expected.getName(), actual.getName()); assertEquals(expected.getName(), actual.getName());
assertEquals(expected.getDescription(), actual.getDescription()); assertEquals(expected.getDescription(), actual.getDescription());
assertEquals(expected.getLogic(), actual.getLogic()); assertEquals(expected.getLogic(), actual.getLogic());
assertEquals(expected.getNotBefore(), actual.getNotBefore());
assertEquals(expected.getNotOnOrAfter(), actual.getNotOnOrAfter());
assertEquals(expected.getDayMonth(), actual.getDayMonth());
assertEquals(expected.getDayMonthEnd(), actual.getDayMonthEnd());
assertEquals(expected.getHour(), actual.getHour());
assertEquals(expected.getHourEnd(), actual.getHourEnd());
assertEquals(expected.getMinute(), actual.getMinute());
assertEquals(expected.getMinuteEnd(), actual.getMinuteEnd());
assertEquals(expected.getMonth(), actual.getMonth());
assertEquals(expected.getMonthEnd(), actual.getMonthEnd());
assertEquals(expected.getYear(), actual.getYear());
assertEquals(expected.getYearEnd(), actual.getYearEnd());
return actual; return actual;
} }

2
themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js
View file

@ -2321,7 +2321,7 @@ module.service("PolicyController", function($http, $route, $location, ResourceSe
} }
$instance.restoreState($scope); $instance.restoreState($scope);
} else if (delegate.onInitUpdate) { } else if (delegate.onInitUpdate) {
delegate.onInitUpdate(policy); delegate.onInitUpdate($scope.policy);
} }
$scope.$watch('policy', function() { $scope.$watch('policy', function() {