Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/amtvedt/devops-workshop

src/main/webapp/app.html

@@ -17,8 +17,8 @@
             </div>
             <div class="menu">
                 <ul>
-                    <li><a href="http://129.241.96.52:61208/">Ressursovervåking</a></li>
-                    <li><a href="#">Logg</a></li>
+                    <li><a href="http://129.241.96.56:61208/">Ressursovervåking</a></li>
+                    <li><a href="http://129.241.96.56:3000/d/ESYAe0tnk">Logg</a></li>
                     <li><a href="./settings.html">Innstillinger</a></li>
                     <li><a href="/">Logg ut</a></li>
                 </ul>

src/test/java/CalculatorResourceTest.java

@@ -13,7 +13,7 @@ public class CalculatorResourceTest{
         assertEquals(400, calculatorResource.calculate(expression));
 
         expression = " 300 - 99 ";
-        assertEquals(200, calculatorResource.calculate(expression));
+        assertEquals(201, calculatorResource.calculate(expression));
     }
 
     @Test