Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
64f30ea0
Commit
64f30ea0
authored
Jan 14, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes bad wording in FF loading state
parent
e2761f05
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
2 deletions
+34
-2
ee/app/assets/javascripts/feature_flags/components/feature_flags.vue
...ts/javascripts/feature_flags/components/feature_flags.vue
+2
-2
ee/spec/javascripts/projects/feature_flags/feature_flags_spec.js
.../javascripts/projects/feature_flags/feature_flags_spec.js
+29
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/assets/javascripts/feature_flags/components/feature_flags.vue
View file @
64f30ea0
...
...
@@ -142,9 +142,9 @@ export default {
<gl-loading-icon
v-if=
"isLoading"
:label=
"s__('
Pipelines|Loading Pipeline
s')"
:label=
"s__('
FeatureFlags|Loading Feature Flag
s')"
:size=
"3"
class=
"prepend-top-20"
class=
"
js-loading-state
prepend-top-20"
/>
<template
v-else-if=
"shouldRenderErrorState"
>
...
...
ee/spec/javascripts/projects/feature_flags/feature_flags_spec.js
View file @
64f30ea0
...
...
@@ -30,6 +30,35 @@ describe('Feature Flags', () => {
mock
.
restore
();
});
describe
(
'
loading state
'
,
()
=>
{
it
(
'
renders a loading icon
'
,
done
=>
{
mock
.
onGet
(
mockData
.
endpoint
).
reply
(
200
,
{
feature_flags
:
[],
count
:
{
all
:
0
,
enabled
:
0
,
disabled
:
0
,
},
});
component
=
mountComponentWithStore
(
FeatureFlagsComponent
,
{
store
,
props
:
mockData
,
});
const
loadingElement
=
component
.
$el
.
querySelector
(
'
.js-loading-state
'
);
expect
(
loadingElement
).
not
.
toBeNull
();
expect
(
loadingElement
.
querySelector
(
'
i
'
).
getAttribute
(
'
aria-label
'
)).
toEqual
(
'
Loading Feature Flags
'
,
);
setTimeout
(()
=>
{
done
();
},
0
);
});
});
describe
(
'
successful request
'
,
()
=>
{
describe
(
'
without feature flags
'
,
()
=>
{
beforeEach
(
done
=>
{
...
...
locale/gitlab.pot
View file @
64f30ea0
...
...
@@ -3770,6 +3770,9 @@ msgstr ""
msgid "FeatureFlags|Instance ID"
msgstr ""
msgid "FeatureFlags|Loading Feature Flags"
msgstr ""
msgid "FeatureFlags|More Information"
msgstr ""
...
...
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