scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
[Master] Hotfix/join flow
This commit is contained in:
picklesrus 2019-11-18 12:16:41 -05:00 committed by GitHub
commit 94f52bafd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/join-flow/welcome-step.jsx
View file

@ -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"

7
src/redux/navigation.js
View file

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

4
test/integration-legacy/smoke-testing/test-join.js
View file

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

2
test/unit/redux/navigation.test.js
View file

@ -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