iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge test conflicts

This commit is contained in:
jesus-dayo 2016-08-11 09:53:49 +08:00
parent 2817953d0b
commit 19b65ea960
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-rest-angular-pagination/src/main/resources/application.properties
View File

@ -1 +1 @@
server.contextPath=/StudentDirectory server.contextPath=/

1
spring-rest-angular-pagination/src/main/webapp/view/app.js
View File

@ -17,6 +17,7 @@ app.controller('StudentCtrl', ['$scope','StudentService', function ($scope,Stude
paginationPageSizes: [5, 10, 20], paginationPageSizes: [5, 10, 20],
paginationPageSize: paginationOptions.pageSize, paginationPageSize: paginationOptions.pageSize,
enableColumnMenus:false, enableColumnMenus:false,
useExternalPagination: true,
columnDefs: [ columnDefs: [
{ name: 'studentId' }, { name: 'studentId' },
{ name: 'name' }, { name: 'name' },

2
spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java
View File

@ -19,7 +19,7 @@ import static org.hamcrest.core.IsEqual.equalTo;
@IntegrationTest("server.port:8888") @IntegrationTest("server.port:8888")
public class StudentServiceTest { public class StudentServiceTest {
private static final String ENDPOINT = "http://localhost:8888/StudentDirectory/student/get"; private static final String ENDPOINT = "http://localhost:8888/student/get";
@Test @Test
public void givenRequestForStudents_whenPageIsOne_expectContainsNames() { public void givenRequestForStudents_whenPageIsOne_expectContainsNames() {