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

[Master] Hotfix/join flow 

src/components/join-flow/welcome-step.jsx

@@ -50,7 +50,7 @@ class WelcomeStep extends React.Component {
                             innerClassName="join-flow-inner-welcome-step"
                             nextButton={this.props.createProjectOnComplete ? (
                                 <React.Fragment>
-                                    <FormattedMessage id="registration.makeProject" />
+                                    <FormattedMessage id="general.getStarted" />
                                     <img
                                         className="join-flow-next-button-arrow"
                                         src="/svgs/project/r-arrow.svg"

src/redux/navigation.js

@@ -19,7 +19,7 @@ const Types = keyMirror({
 });
 
 module.exports.getInitialState = () => ({
-    useScratch3Registration: false,
+    useScratch3Registration: true,
     accountNavOpen: false,
     canceledDeletionOpen: false,
     loginError: null,
@@ -105,7 +105,10 @@ module.exports.handleRegistrationRequested = () => ({
 
 module.exports.handleCompleteRegistration = createProject => (dispatch => {
     if (createProject) {
-        window.location = '/projects/editor/?tutorial=getStarted';
+        // TODO: Ideally this would take you to the editor with the getting started
+        // tutorial open. We need to do some extra work to wait for the user
+        // to be logged in before we try creating a project due to replication lag.
+        window.location = '/';
     } else {
         dispatch(sessionActions.refreshSession());
         dispatch(module.exports.setRegistrationOpen(false));

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