Skip to content

RJX-1: Improve text before eventually doing better widget stuff. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cervator wants to merge 3 commits into
base: master
Choose a base branch
from
+3 −3
Open

RJX-1: Improve text before eventually doing better widget stuff. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4588b2
RJX-1: Improve text before eventually doing better widget stuff. Tota…
Cervator May 21, 2019
6bd5e07
Whoops, broke a test. Fixing!
Cervator May 21, 2019
a651ed9
Fix another test
Cervator May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/hello/GreetingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@RestController
public class GreetingController {

private static final String template = "Hello there, %s!";
private static final String template = "Hello again there, %s!";
private final AtomicLong counter = new AtomicLong();

@RequestMapping("/greeting")
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/hello/GreetingControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ public class GreetingControllerTests {
public void noParamGreetingShouldReturnDefaultMessage() throws Exception {

this.mockMvc.perform(get("/greeting")).andDo(print()).andExpect(status().isOk())
.andExpect(jsonPath("$.content").value("Hello there, World!"));
.andExpect(jsonPath("$.content").value("Hello again there, World!"));
}

@Test
public void paramGreetingShouldReturnTailoredMessage() throws Exception {

this.mockMvc.perform(get("/greeting").param("name", "Spring Community"))
.andDo(print()).andExpect(status().isOk())
.andExpect(jsonPath("$.content").value("Hello there, Spring Community!"));
.andExpect(jsonPath("$.content").value("Hello again there, Spring Community!"));
}

}