Merged in feature/ui-for-production (pull request #70)

Feature/ui for production

scm-webapp/src/test/java/sonia/scm/ForwardingPushStateDispatcherTest.java

@@ -1,51 +0,0 @@
-package sonia.scm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ForwardingPushStateDispatcherTest {
-
-  @Mock
-  private HttpServletRequest request;
-
-  @Mock
-  private RequestDispatcher requestDispatcher;
-
-  @Mock
-  private HttpServletResponse response;
-
-  private ForwardingPushStateDispatcher dispatcher = new ForwardingPushStateDispatcher();
-
-  @Test
-  public void testDispatch() throws ServletException, IOException {
-    when(request.getRequestDispatcher("/index.html")).thenReturn(requestDispatcher);
-
-    dispatcher.dispatch(request, response, "/something");
-
-    verify(requestDispatcher).forward(request, response);
-  }
-
-  @Test(expected = IOException.class)
-  public void testWrapServletException() throws ServletException, IOException {
-    when(request.getRequestDispatcher("/index.html")).thenReturn(requestDispatcher);
-    doThrow(ServletException.class).when(requestDispatcher).forward(request, response);
-
-    dispatcher.dispatch(request, response, "/something");
-  }
-
-}

scm-webapp/src/test/java/sonia/scm/PushStateDispatcherProviderTest.java

@@ -1,14 +1,23 @@
 package sonia.scm;
 
+import com.google.inject.util.Providers;
 import org.assertj.core.api.Assertions;
 import org.junit.After;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.template.TemplateEngine;
 
-import static org.junit.Assert.*;
-
+@RunWith(MockitoJUnitRunner.class)
 public class PushStateDispatcherProviderTest {
 
-  private PushStateDispatcherProvider provider = new PushStateDispatcherProvider();
+  @Mock
+  private TemplateEngine templateEngine;
+
+  private PushStateDispatcherProvider provider = new PushStateDispatcherProvider(
+    Providers.of(new TemplatingPushStateDispatcher(templateEngine))
+  );
 
   @Test
   public void testGetProxyPushStateWithPropertySet() {
@@ -20,7 +29,7 @@ public class PushStateDispatcherProviderTest {
   @Test
   public void testGetProxyPushStateWithoutProperty() {
     PushStateDispatcher dispatcher = provider.get();
-    Assertions.assertThat(dispatcher).isInstanceOf(ForwardingPushStateDispatcher.class);
+    Assertions.assertThat(dispatcher).isInstanceOf(TemplatingPushStateDispatcher.class);
   }
 
   @After

scm-webapp/src/test/java/sonia/scm/TemplatingPushStateDispatcherTest.java

@@ -0,0 +1,66 @@
+package sonia.scm;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.template.Template;
+import sonia.scm.template.TemplateEngine;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TemplatingPushStateDispatcherTest {
+
+  @Mock
+  private HttpServletRequest request;
+
+  @Mock
+  private HttpServletResponse response;
+
+  @Mock
+  private TemplateEngine templateEngine;
+
+  @Mock
+  private Template template;
+
+  private TemplatingPushStateDispatcher dispatcher;
+
+  @Before
+  public void setUpMocks() {
+    dispatcher = new TemplatingPushStateDispatcher(templateEngine);
+  }
+
+  @Test
+  public void testDispatch() throws IOException {
+    when(request.getContextPath()).thenReturn("/scm");
+    when(templateEngine.getTemplate(TemplatingPushStateDispatcher.TEMPLATE)).thenReturn(template);
+
+    when(response.getWriter()).thenReturn(new PrintWriter(new StringWriter()));
+
+    dispatcher.dispatch(request, response, "/someurl");
+
+    verify(response).setContentType("text/html");
+    verify(response).setCharacterEncoding("UTF-8");
+
+    ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
+
+    verify(template).execute(any(Writer.class), captor.capture());
+
+    TemplatingPushStateDispatcher.IndexHtmlModel model = (TemplatingPushStateDispatcher.IndexHtmlModel) captor.getValue();
+    assertEquals("/scm", model.getContextPath());
+  }
+
+}

scm-webapp/src/test/java/sonia/scm/WebResourceServletTest.java

@@ -22,7 +22,7 @@ import java.io.IOException;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class WebResourceServletTest {
 
   @Rule