Merge remote-tracking branch 'upstream/main' into transactional

alina tarasova · alina tarasova · commit b12560aaca23 · 2025-02-04T08:58:51.000+03:00
diff --git a/README.md b/README.md
@@ -20,8 +20,12 @@ Demo: https://java-spring-blog.hexlet.app/
 ## Development
 
 ```bash
-# https://localhost
+make setup
+
 make dev
+# https://localhost
+# username: hexlet@example.com
+# password: qwerty
 
 make test
 ```
diff --git a/frontend/index.html b/frontend/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>Java Spring Blog</title>
   </head>
   <body>
     <div id="root"></div>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -30,3 +30,4 @@ rsa:
 
 server:
   address: 0.0.0.0
+  port: ${PORT:8080}
diff --git a/src/test/java/io/hexlet/blog/controller/api/PostsControllerTest.java b/src/test/java/io/hexlet/blog/controller/api/PostsControllerTest.java
@@ -124,7 +124,7 @@ public void testCreate() throws Exception {
         mockMvc.perform(request)
                 .andExpect(status().isCreated());
 
-        var post = postRepository.findBySlug(testPost.getSlug()).orElseThrow();
+        var post = postRepository.findBySlug(testPost.getSlug()).orElse(null);
         assertNotNull(post);
         assertThat(post.getName()).isEqualTo(testPost.getName());
     }
diff --git a/src/test/java/io/hexlet/blog/controller/api/UsersControllerTest.java b/src/test/java/io/hexlet/blog/controller/api/UsersControllerTest.java
@@ -107,7 +107,7 @@ public void testCreate() throws Exception {
         mockMvc.perform(request)
                 .andExpect(status().isCreated());
 
-        var user = userRepository.findByEmail(data.getEmail()).orElseThrow();
+        var user = userRepository.findByEmail(data.getEmail()).orElse(null);
 
         assertNotNull(user);
         assertThat(user.getFirstName()).isEqualTo(data.getFirstName());

Original file line number	Diff line number	Diff line change
`@@ -30,3 +30,4 @@ rsa:`
`30`	`30`
`31`	`31`	`server:`
`32`	`32`	`address: 0.0.0.0`
	`33`	`+ port: ${PORT:8080}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public void testCreate() throws Exception {`
`124`	`124`	`mockMvc.perform(request)`
`125`	`125`	`.andExpect(status().isCreated());`
`126`	`126`
`127`		`- var post = postRepository.findBySlug(testPost.getSlug()).orElseThrow();`
	`127`	`+ var post = postRepository.findBySlug(testPost.getSlug()).orElse(null);`
`128`	`128`	`assertNotNull(post);`
`129`	`129`	`assertThat(post.getName()).isEqualTo(testPost.getName());`
`130`	`130`	`}`