yegor256#968 corrected the conflict

lucasmessias9898 · Mar 28, 2019 · f7ae3c6 · f7ae3c6
1 parent 8372013
commit f7ae3c6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/test/java/org/takes/rs/RsWithoutHeaderTest.java b/src/test/java/org/takes/rs/RsWithoutHeaderTest.java
@@ -23,8 +23,8 @@
  */
 package org.takes.rs;
 
-import com.google.common.base.Joiner;
 import java.io.IOException;
+import org.cactoos.text.JoinedText;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
@@ -49,11 +49,12 @@ public void addsHeadersToResponse() throws IOException {
                 )
             ).print(),
             Matchers.equalTo(
-                Joiner.on("\r\n").join(
+                new JoinedText(
+                    "\r\n",
                     "HTTP/1.1 200 OK",
                     "",
                     ""
-                )
+                ).asString()
             )
         );
     }