From 64afb5f55adf51be357938b6c69d028fdf1e0fe5 Mon Sep 17 00:00:00 2001
From: Derk-Jan Karrenbeld <derk-jan+github@karrenbeld.info>
Date: Tue, 26 Mar 2019 16:40:11 +0100
Subject: [PATCH 1/4] Promote two-fer to core

And make sure we expect an optional argument, instead of passing in null, requiring boolean logic.
---
 config.json                       | 28 +++++++++++++---------------
 exercises/two-fer/example.js      |  5 ++---
 exercises/two-fer/two-fer.spec.js | 25 +++++++++++++------------
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/config.json b/config.json
index 8da5f324f9..619e42fdf4 100644
--- a/config.json
+++ b/config.json
@@ -18,6 +18,18 @@
         "text_formatting"
       ]
     },
+    {
+      "slug": "two-fer",
+      "uuid": "7f49e997-4435-4f34-a020-bddc92c838ed",
+      "core": true,
+      "unlocked_by": null,
+      "difficulty": 1,
+      "topics": [
+        "optional_values",
+        "strings",
+        "text_formatting"
+      ]
+    },
     {
       "slug": "leap",
       "uuid": "7c8294ee-5924-4bf8-a72f-31d0e2d7d9a0",
@@ -224,25 +236,11 @@
         "games"
       ]
     },
-    {
-      "slug": "two-fer",
-      "uuid": "7f49e997-4435-4f34-a020-bddc92c838ed",
-      "core": false,
-      "unlocked_by": "hello-world",
-      "difficulty": 1,
-      "topics": [
-        "booleans",
-        "logic",
-        "optional_values",
-        "strings",
-        "text_formatting"
-      ]
-    },
     {
       "slug": "reverse-string",
       "uuid": "e84c97eb-dbec-487c-b99f-ae9924e16293",
       "core": false,
-      "unlocked_by": "leap",
+      "unlocked_by": "two-fer",
       "difficulty": 2,
       "topics": [
         "for",
diff --git a/exercises/two-fer/example.js b/exercises/two-fer/example.js
index 675a8b7058..ac908cf32e 100644
--- a/exercises/two-fer/example.js
+++ b/exercises/two-fer/example.js
@@ -1,4 +1,3 @@
-export const twoFer = (name) => {
-  const nameText = name || 'you';
-  return `One for ${nameText}, one for me.`;
+export const twoFer = (name = 'you') => {
+  return `One for ${name}, one for me.`;
 };
diff --git a/exercises/two-fer/two-fer.spec.js b/exercises/two-fer/two-fer.spec.js
index 1653b41db0..656b97b11c 100644
--- a/exercises/two-fer/two-fer.spec.js
+++ b/exercises/two-fer/two-fer.spec.js
@@ -1,18 +1,19 @@
-import { twoFer } from './two-fer';
+import { twoFer } from './two-fer.js'
 
-describe('twoFer()', () => {
+describe('no name given', () => {
   test('no name given', () => {
-    const name = '';
-    expect(twoFer(name)).toEqual('One for you, one for me.');
-  });
+    expect(twoFer()).toEqual("One for you, one for me.")
+  })
+})
 
+describe('a name given', () => {
   xtest('a name given', () => {
-    const name = 'Alice';
-    expect(twoFer(name)).toEqual('One for Alice, one for me.');
-  });
+    expect(twoFer("Alice")).toEqual("One for Alice, one for me.")
+  })
+})
 
+describe('another name given', () => {
   xtest('another name given', () => {
-    const name = 'Bob';
-    expect(twoFer(name)).toEqual('One for Bob, one for me.');
-  });
-});
+    expect(twoFer("Bob")).toEqual("One for Bob, one for me.")
+  })
+})

From 3ca7abad0f5d317684dea91b6bf5b9e4c0780e81 Mon Sep 17 00:00:00 2001
From: Derk-Jan Karrenbeld <derk-jan+github@karrenbeld.info>
Date: Tue, 26 Mar 2019 16:41:46 +0100
Subject: [PATCH 2/4] :fire: woops

---
 exercises/two-fer/two-fer.spec.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/exercises/two-fer/two-fer.spec.js b/exercises/two-fer/two-fer.spec.js
index 656b97b11c..600dec5422 100644
--- a/exercises/two-fer/two-fer.spec.js
+++ b/exercises/two-fer/two-fer.spec.js
@@ -1,18 +1,14 @@
 import { twoFer } from './two-fer.js'
 
-describe('no name given', () => {
+describe('twoFer()', () => {
   test('no name given', () => {
     expect(twoFer()).toEqual("One for you, one for me.")
   })
-})
 
-describe('a name given', () => {
   xtest('a name given', () => {
     expect(twoFer("Alice")).toEqual("One for Alice, one for me.")
   })
-})
 
-describe('another name given', () => {
   xtest('another name given', () => {
     expect(twoFer("Bob")).toEqual("One for Bob, one for me.")
   })

From 957c6e1cdf8c4e57baa71f94379b68457b4b3201 Mon Sep 17 00:00:00 2001
From: Derk-Jan Karrenbeld <derk-jan+github@karrenbeld.info>
Date: Tue, 26 Mar 2019 19:14:08 +0100
Subject: [PATCH 3/4] Remove extension from import

---
 exercises/two-fer/two-fer.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exercises/two-fer/two-fer.spec.js b/exercises/two-fer/two-fer.spec.js
index 600dec5422..e7912e60bb 100644
--- a/exercises/two-fer/two-fer.spec.js
+++ b/exercises/two-fer/two-fer.spec.js
@@ -1,4 +1,4 @@
-import { twoFer } from './two-fer.js'
+import { twoFer } from './two-fer'
 
 describe('twoFer()', () => {
   test('no name given', () => {

From 20d961e6e7f8a9b9d0aed9d5af180c9c87052b18 Mon Sep 17 00:00:00 2001
From: Derk-Jan Karrenbeld <derk-jan+github@karrenbeld.info>
Date: Tue, 26 Mar 2019 19:25:06 +0100
Subject: [PATCH 4/4] Remove old two-fer entry

---
 config.json | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/config.json b/config.json
index 0f29dc205a..1526780fc5 100644
--- a/config.json
+++ b/config.json
@@ -235,20 +235,6 @@
         "games"
       ]
     },
-    {
-      "slug": "two-fer",
-      "uuid": "7f49e997-4435-4f34-a020-bddc92c838ed",
-      "core": false,
-      "unlocked_by": "hello-world",
-      "difficulty": 1,
-      "topics": [
-        "booleans",
-        "logic",
-        "optional_values",
-        "strings",
-        "text_formatting"
-      ]
-    },
     {
       "slug": "leap",
       "uuid": "7c8294ee-5924-4bf8-a72f-31d0e2d7d9a0",