scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
[Develop] Hotfix/join Merge hotfix that enables join flow back to develop
This commit is contained in:
picklesrus 2019-11-18 12:44:03 -05:00 committed by GitHub
commit a111be6db9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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,

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