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
b9ee324a
Commit
b9ee324a
authored
May 28, 2019
by
Winnie Hellmann
Committed by
Kushal Pandya
May 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '61511-add-expand-collapse-to-project-operation-setttings-2' into 'master'"
This reverts merge request !28620
parent
74001467
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
21 deletions
+1
-21
app/assets/javascripts/operation_settings/components/external_dashboard.vue
...ipts/operation_settings/components/external_dashboard.vue
+1
-6
spec/frontend/operation_settings/components/external_dashboard_spec.js
.../operation_settings/components/external_dashboard_spec.js
+0
-15
No files found.
app/assets/javascripts/operation_settings/components/external_dashboard.vue
View file @
b9ee324a
<
script
>
<
script
>
import
{
GlButton
,
GlFormGroup
,
GlFormInput
,
GlLink
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlFormGroup
,
GlFormInput
,
GlLink
}
from
'
@gitlab/ui
'
;
import
initSettingsPanels
from
'
~/settings_panels
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
@@ -20,19 +19,15 @@ export default {
...
@@ -20,19 +19,15 @@ export default {
required
:
true
,
required
:
true
,
},
},
},
},
mounted
()
{
initSettingsPanels
();
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<section
class=
"settings
no-animate
"
>
<section
class=
"settings
expanded
"
>
<div
class=
"settings-header"
>
<div
class=
"settings-header"
>
<h4
class=
"js-section-header"
>
<h4
class=
"js-section-header"
>
{{
s__
(
'
ExternalMetrics|External Dashboard
'
)
}}
{{
s__
(
'
ExternalMetrics|External Dashboard
'
)
}}
</h4>
</h4>
<gl-button
class=
"js-settings-toggle"
>
{{
__
(
'
Expand
'
)
}}
</gl-button>
<p
class=
"js-section-sub-header"
>
<p
class=
"js-section-sub-header"
>
{{
{{
s__
(
s__
(
...
...
spec/frontend/operation_settings/components/external_dashboard_spec.js
View file @
b9ee324a
...
@@ -2,9 +2,6 @@ import { shallowMount } from '@vue/test-utils';
...
@@ -2,9 +2,6 @@ import { shallowMount } from '@vue/test-utils';
import
{
GlButton
,
GlLink
,
GlFormGroup
,
GlFormInput
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLink
,
GlFormGroup
,
GlFormInput
}
from
'
@gitlab/ui
'
;
import
ExternalDashboard
from
'
~/operation_settings/components/external_dashboard.vue
'
;
import
ExternalDashboard
from
'
~/operation_settings/components/external_dashboard.vue
'
;
import
{
TEST_HOST
}
from
'
helpers/test_constants
'
;
import
{
TEST_HOST
}
from
'
helpers/test_constants
'
;
import
initSettingsPanels
from
'
~/settings_panels
'
;
jest
.
mock
(
'
~/settings_panels
'
);
describe
(
'
operation settings external dashboard component
'
,
()
=>
{
describe
(
'
operation settings external dashboard component
'
,
()
=>
{
let
wrapper
;
let
wrapper
;
...
@@ -24,18 +21,6 @@ describe('operation settings external dashboard component', () => {
...
@@ -24,18 +21,6 @@ describe('operation settings external dashboard component', () => {
expect
(
wrapper
.
find
(
'
.js-section-header
'
).
text
()).
toBe
(
'
External Dashboard
'
);
expect
(
wrapper
.
find
(
'
.js-section-header
'
).
text
()).
toBe
(
'
External Dashboard
'
);
});
});
describe
(
'
expand/collapse button
'
,
()
=>
{
it
(
'
is properly instantiated as a settings panel
'
,
()
=>
{
expect
(
initSettingsPanels
).
toHaveBeenCalled
();
});
it
(
'
defaults to collapsed state
'
,
()
=>
{
const
button
=
wrapper
.
find
(
GlButton
);
expect
(
button
.
text
()).
toBe
(
'
Expand
'
);
});
});
describe
(
'
sub-header
'
,
()
=>
{
describe
(
'
sub-header
'
,
()
=>
{
let
subHeader
;
let
subHeader
;
...
...
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