Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
94f52baf
Unverified
Commit
94f52baf
authored
Nov 18, 2019
by
picklesrus
Committed by
GitHub
Nov 18, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3541 from LLK/hotfix/join-flow
[Master] Hotfix/join flow
parents
0bc3df1b
9bc60390
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
src/components/join-flow/welcome-step.jsx
src/components/join-flow/welcome-step.jsx
+1
-1
src/redux/navigation.js
src/redux/navigation.js
+5
-2
test/integration-legacy/smoke-testing/test-join.js
test/integration-legacy/smoke-testing/test-join.js
+3
-1
test/unit/redux/navigation.test.js
test/unit/redux/navigation.test.js
+1
-1
No files found.
src/components/join-flow/welcome-step.jsx
View file @
94f52baf
...
@@ -50,7 +50,7 @@ class WelcomeStep extends React.Component {
...
@@ -50,7 +50,7 @@ class WelcomeStep extends React.Component {
innerClassName=
"join-flow-inner-welcome-step"
innerClassName=
"join-flow-inner-welcome-step"
nextButton=
{
this
.
props
.
createProjectOnComplete
?
(
nextButton=
{
this
.
props
.
createProjectOnComplete
?
(
<
React
.
Fragment
>
<
React
.
Fragment
>
<
FormattedMessage
id=
"
registration.makeProject
"
/>
<
FormattedMessage
id=
"
general.getStarted
"
/>
<
img
<
img
className=
"join-flow-next-button-arrow"
className=
"join-flow-next-button-arrow"
src=
"/svgs/project/r-arrow.svg"
src=
"/svgs/project/r-arrow.svg"
...
...
src/redux/navigation.js
View file @
94f52baf
...
@@ -19,7 +19,7 @@ const Types = keyMirror({
...
@@ -19,7 +19,7 @@ const Types = keyMirror({
});
});
module
.
exports
.
getInitialState
=
()
=>
({
module
.
exports
.
getInitialState
=
()
=>
({
useScratch3Registration
:
fals
e
,
useScratch3Registration
:
tru
e
,
accountNavOpen
:
false
,
accountNavOpen
:
false
,
canceledDeletionOpen
:
false
,
canceledDeletionOpen
:
false
,
loginError
:
null
,
loginError
:
null
,
...
@@ -105,7 +105,10 @@ module.exports.handleRegistrationRequested = () => ({
...
@@ -105,7 +105,10 @@ module.exports.handleRegistrationRequested = () => ({
module
.
exports
.
handleCompleteRegistration
=
createProject
=>
(
dispatch
=>
{
module
.
exports
.
handleCompleteRegistration
=
createProject
=>
(
dispatch
=>
{
if
(
createProject
)
{
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
{
}
else
{
dispatch
(
sessionActions
.
refreshSession
());
dispatch
(
sessionActions
.
refreshSession
());
dispatch
(
module
.
exports
.
setRegistrationOpen
(
false
));
dispatch
(
module
.
exports
.
setRegistrationOpen
(
false
));
...
...
test/integration-legacy/smoke-testing/test-join.js
View file @
94f52baf
...
@@ -23,7 +23,9 @@ tap.beforeEach(function () {
...
@@ -23,7 +23,9 @@ tap.beforeEach(function () {
return
driver
.
get
(
rootUrl
);
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
'
)
clickText
(
'
Join Scratch
'
)
.
then
(()
=>
findByXpath
(
'
//iframe[contains(@class, "mod-registration")]
'
))
.
then
(()
=>
findByXpath
(
'
//iframe[contains(@class, "mod-registration")]
'
))
.
then
(()
=>
t
.
end
());
.
then
(()
=>
t
.
end
());
...
...
test/unit/redux/navigation.test.js
View file @
94f52baf
...
@@ -28,7 +28,7 @@ describe('unit test lib/validate.js', () => {
...
@@ -28,7 +28,7 @@ describe('unit test lib/validate.js', () => {
expect
(
navigationReducer
(
defaultState
,
{
type
:
'
anything
'
}).
loginOpen
).
toBe
(
false
);
expect
(
navigationReducer
(
defaultState
,
{
type
:
'
anything
'
}).
loginOpen
).
toBe
(
false
);
expect
(
navigationReducer
(
defaultState
,
{
type
:
'
anything
'
}).
registrationOpen
).
toBe
(
false
);
expect
(
navigationReducer
(
defaultState
,
{
type
:
'
anything
'
}).
registrationOpen
).
toBe
(
false
);
expect
(
navigationReducer
(
defaultState
,
{
type
:
'
anything
'
}).
searchTerm
).
toBe
(
''
);
expect
(
navigationReducer
(
defaultState
,
{
type
:
'
anything
'
}).
searchTerm
).
toBe
(
''
);
expect
(
navigationReducer
(
defaultState
,
{
type
:
'
anything
'
}).
useScratch3Registration
).
toBe
(
fals
e
);
expect
(
navigationReducer
(
defaultState
,
{
type
:
'
anything
'
}).
useScratch3Registration
).
toBe
(
tru
e
);
});
});
// handleToggleAccountNav
// handleToggleAccountNav
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment