Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
logging-scratch-gui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Goessmann
logging-scratch-gui
Commits
8aece59a
Unverified
Commit
8aece59a
authored
6 years ago
by
Paul Kaplan
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #4092 from LLK/revert-4035-admin-sees-author
Revert 4035 admin sees author
parents
e4701e7b
a4d3b6b7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/menu-bar/menu-bar.jsx
+1
-1
1 addition, 1 deletion
src/components/menu-bar/menu-bar.jsx
test/integration/menu-bar.test.js
+10
-0
10 additions, 0 deletions
test/integration/menu-bar.test.js
with
11 additions
and
1 deletion
src/components/menu-bar/menu-bar.jsx
+
1
−
1
View file @
8aece59a
...
@@ -461,7 +461,7 @@ class MenuBar extends React.Component {
...
@@ -461,7 +461,7 @@ class MenuBar extends React.Component {
<
FormattedMessage
{
...
ariaMessages
.
tutorials
}
/>
<
FormattedMessage
{
...
ariaMessages
.
tutorials
}
/>
</
div
>
</
div
>
<
Divider
className
=
{
classNames
(
styles
.
divider
)
}
/>
<
Divider
className
=
{
classNames
(
styles
.
divider
)
}
/>
{
this
.
props
.
canSave
&&
this
.
props
.
canEditTitle
?
(
{
this
.
props
.
canEditTitle
?
(
<
div
className
=
{
classNames
(
styles
.
menuBarItem
,
styles
.
growable
)
}
>
<
div
className
=
{
classNames
(
styles
.
menuBarItem
,
styles
.
growable
)
}
>
<
MenuBarItemTooltip
<
MenuBarItemTooltip
enable
enable
...
...
This diff is collapsed.
Click to expand it.
test/integration/menu-bar.test.js
+
10
−
0
View file @
8aece59a
...
@@ -2,6 +2,7 @@ import path from 'path';
...
@@ -2,6 +2,7 @@ import path from 'path';
import
SeleniumHelper
from
'
../helpers/selenium-helper
'
;
import
SeleniumHelper
from
'
../helpers/selenium-helper
'
;
const
{
const
{
clickText
,
clickXpath
,
clickXpath
,
findByXpath
,
findByXpath
,
getDriver
,
getDriver
,
...
@@ -64,4 +65,13 @@ describe('Menu bar settings', () => {
...
@@ -64,4 +65,13 @@ describe('Menu bar settings', () => {
const
currentUrl
=
await
driver
.
getCurrentUrl
();
const
currentUrl
=
await
driver
.
getCurrentUrl
();
await
expect
(
currentUrl
).
toEqual
(
'
https://scratch.mit.edu/
'
);
await
expect
(
currentUrl
).
toEqual
(
'
https://scratch.mit.edu/
'
);
});
});
test
(
'
(GH#4064) Project name should be editable
'
,
async
()
=>
{
await
loadUri
(
uri
);
await
clickXpath
(
'
//button[@title="Try It"]
'
);
const
el
=
await
findByXpath
(
'
//input[@value="Scratch Project"]
'
);
await
el
.
sendKeys
(
'
- Personalized
'
);
await
clickText
(
'
Costumes
'
);
// just to blur the input
await
clickXpath
(
'
//input[@value="Scratch Project - Personalized"]
'
);
});
});
});
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment