Skip to content

Commit 9871535

Browse files
author
javawebinar@yandex.ru
committed
Small correction
1 parent cf4d988 commit 9871535

4 files changed

Lines changed: 4 additions & 7 deletions

File tree

hr.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
call mvn -P heroku,postgres -DskipTests=true package
1+
call mvn -B -s settings.xml -DskipTests=true clean install
22
call java -Dspring.profiles.active="datajpa,heroku" -DDATABASE_URL="postgres://user:user@localhost:5432/topjava02" -jar target/dependency/webapp-runner.jar target/*.war

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.0-SNAPSHOT</version>
1010

1111
<name>Calories Management</name>
12-
<url>http://caloriesmng.herokuapp.com/</url>
12+
<url>http://topjava.herokuapp.com/</url>
1313

1414
<properties>
1515
<java.version>1.8</java.version>

src/main/resources/db/postgres.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#database.url=jdbc:postgresql://ec2-54-228-184-236.eu-west-1.compute.amazonaws.com:5432/dfgpjfq69ca298?ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory
2-
#database.username=banydqiclzovdb
3-
#database.password=h62cZV7oFaJGwaCkqtGuG93nfl
4-
51
database.url=jdbc:postgresql://localhost:5432/topjava02
62
database.username=user
73
database.password=user

src/test/java/ru/javawebinar/topjava/web/user/AdminRestControllerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ public void testCreate() throws Exception {
110110

111111
@Test
112112
public void testGetAll() throws Exception {
113-
TestUtil.print(mockMvc.perform(get(REST_URL).contentType(MediaType.APPLICATION_JSON)
113+
TestUtil.print(mockMvc.perform(get(REST_URL)
114+
.contentType(MediaType.APPLICATION_JSON)
114115
.with(userHttpBasic(ADMIN)))
115116
.andExpect(status().isOk())
116117
.andExpect(content().contentType(MediaType.APPLICATION_JSON))

0 commit comments

Comments
 (0)