From 49895f473fd0d18bf9688e69a944a75a94c4df96 Mon Sep 17 00:00:00 2001
From: HalidOdat <halidodat@gmail.com>
Date: Wed, 1 Jul 2020 21:08:54 +0200
Subject: [PATCH] Cleanup and added test for String.prototype.concat

---
 boa/src/builtins/string/mod.rs   |  2 --
 boa/src/builtins/string/tests.rs | 25 ++++++++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/boa/src/builtins/string/mod.rs b/boa/src/builtins/string/mod.rs
index de5f0463520..6ff42c903cc 100644
--- a/boa/src/builtins/string/mod.rs
+++ b/boa/src/builtins/string/mod.rs
@@ -184,8 +184,6 @@ impl String {
     /// [spec]: https://tc39.es/ecma262/#sec-string.prototype.concat
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/concat
     pub(crate) fn concat(this: &Value, args: &[Value], ctx: &mut Interpreter) -> ResultValue {
-        // First we get it the actual string a private field stored on the object only the engine has access to.
-        // Then we convert it into a Rust String by wrapping it in from_value
         let object = ctx.require_object_coercible(this)?;
         let mut string = ctx.to_string(object)?.to_string();
 
diff --git a/boa/src/builtins/string/tests.rs b/boa/src/builtins/string/tests.rs
index 31229bdb84f..a94ad7af567 100644
--- a/boa/src/builtins/string/tests.rs
+++ b/boa/src/builtins/string/tests.rs
@@ -71,11 +71,26 @@ fn concat() {
         "#;
     eprintln!("{}", forward(&mut engine, init));
 
-    // Todo: fix this
-    let _a = forward(&mut engine, "hello.concat(world, nice)");
-    let _b = forward(&mut engine, "hello + world + nice");
-    // assert_eq!(a, String::from("Hello, world! Have a nice day."));
-    // assert_eq!(b, String::from("Hello, world! Have a nice day."));
+    let a = forward(&mut engine, "hello.concat(world, nice)");
+    assert_eq!(a, "Hello, world! Have a nice day.");
+
+    // TODO: uncoment this when #520 lands
+    //let b = forward(&mut engine, "hello + world + nice");
+    // assert_eq!(b, "Hello, world! Have a nice day.");
+}
+
+#[test]
+fn generic_concat() {
+    let realm = Realm::create();
+    let mut engine = Interpreter::new(realm);
+    let init = r#"
+        Number.prototype.concat = String.prototype.concat;
+        let number = new Number(100);
+        "#;
+    eprintln!("{}", forward(&mut engine, init));
+
+    let a = forward(&mut engine, "number.concat(' - 50', ' = 50')");
+    assert_eq!(a, "100 - 50 = 50");
 }
 
 #[allow(clippy::result_unwrap_used)]