Merge pull request #3540 from LLK/hotfix/join-flow

[Develop] Hotfix/join Merge hotfix that enables join flow back to develop

src/redux/navigation.js

@@ -19,7 +19,7 @@ const Types = keyMirror({
 });
 
 module.exports.getInitialState = () => ({
-    useScratch3Registration: false,
+    useScratch3Registration: true,
     accountNavOpen: false,
     canceledDeletionOpen: false,
     loginError: null,

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());

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