From 5b351b6515e7478b7ecfdc6f8853218e7bc7e373 Mon Sep 17 00:00:00 2001
From: picklesrus <picklesrus@users.noreply.github.com>
Date: Fri, 15 Nov 2019 11:28:10 -0500
Subject: [PATCH 1/2] Roll out new Join Flow.

---
 src/redux/navigation.js            | 2 +-
 test/unit/redux/navigation.test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/redux/navigation.js b/src/redux/navigation.js
index 3f96619ba..2153c16ea 100644
--- a/src/redux/navigation.js
+++ b/src/redux/navigation.js
@@ -19,7 +19,7 @@ const Types = keyMirror({
 });
 
 module.exports.getInitialState = () => ({
-    useScratch3Registration: false,
+    useScratch3Registration: true,
     accountNavOpen: false,
     canceledDeletionOpen: false,
     loginError: null,
diff --git a/test/unit/redux/navigation.test.js b/test/unit/redux/navigation.test.js
index 1a57bf012..db8a591aa 100644
--- a/test/unit/redux/navigation.test.js
+++ b/test/unit/redux/navigation.test.js
@@ -28,7 +28,7 @@ describe('unit test lib/validate.js', () => {
         expect(navigationReducer(defaultState, {type: 'anything'}).loginOpen).toBe(false);
         expect(navigationReducer(defaultState, {type: 'anything'}).registrationOpen).toBe(false);
         expect(navigationReducer(defaultState, {type: 'anything'}).searchTerm).toBe('');
-        expect(navigationReducer(defaultState, {type: 'anything'}).useScratch3Registration).toBe(false);
+        expect(navigationReducer(defaultState, {type: 'anything'}).useScratch3Registration).toBe(true);
     });
 
     // handleToggleAccountNav

From 7fa103e3443e1a6cb7e02e8448371395c26b4865 Mon Sep 17 00:00:00 2001
From: picklesrus <picklesrus@users.noreply.github.com>
Date: Mon, 18 Nov 2019 10:20:02 -0500
Subject: [PATCH 2/2] Skip the join flow smoke test since it was put in place
 to make sure we didn't launch the new join flow by mistake.

---
 test/integration-legacy/smoke-testing/test-join.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/integration-legacy/smoke-testing/test-join.js b/test/integration-legacy/smoke-testing/test-join.js
index ea524b061..052853e0b 100644
--- a/test/integration-legacy/smoke-testing/test-join.js
+++ b/test/integration-legacy/smoke-testing/test-join.js
@@ -23,7 +23,9 @@ tap.beforeEach(function () {
     return driver.get(rootUrl);
 });
 
-test('Clicking Join Scratch opens scratchr2 iframe', t => {
+// Skipping this test while launching new join flow.
+// TODO: Add new smoke tests for the new Join flow!
+test('Clicking Join Scratch opens scratchr2 iframe', {skip: true}, t => {
     clickText('Join Scratch')
         .then(() => findByXpath('//iframe[contains(@class, "mod-registration")]'))
         .then(() => t.end());