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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
5197b011
Commit
5197b011
authored
Apr 04, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes broken lints
Adds js unit tests
parent
d037a2e9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
65 additions
and
42 deletions
+65
-42
app/assets/javascripts/environments/components/environment_actions.js
...avascripts/environments/components/environment_actions.js
+18
-5
app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js
...ripts/vue_pipelines_index/components/pipelines_actions.js
+17
-4
spec/features/projects/environments/environments_spec.rb
spec/features/projects/environments/environments_spec.rb
+0
-15
spec/features/projects/pipelines/pipelines_spec.rb
spec/features/projects/pipelines/pipelines_spec.rb
+0
-18
spec/javascripts/environments/environment_actions_spec.js
spec/javascripts/environments/environment_actions_spec.js
+15
-0
spec/javascripts/vue_pipelines_index/pipelines_actions_spec.js
...javascripts/vue_pipelines_index/pipelines_actions_spec.js
+15
-0
No files found.
app/assets/javascripts/environments/components/environment_actions.js
View file @
5197b011
...
...
@@ -45,6 +45,14 @@ export default {
new
Flash
(
'
An error occured while making the request.
'
);
});
},
isActionDisabled
(
action
)
{
if
(
action
.
playable
===
undefined
)
{
return
false
;
}
return
!
action
.
playable
;
},
},
template
:
`
...
...
@@ -59,18 +67,23 @@ export default {
:disabled="isLoading">
<span>
<span v-html="playIconSvg"></span>
<i class="fa fa-caret-down" aria-hidden="true"></i>
<i v-if="isLoading" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
<i
class="fa fa-caret-down"
aria-hidden="true"/>
<i
v-if="isLoading"
class="fa fa-spinner fa-spin"
aria-hidden="true"/>
</span>
<ul class="dropdown-menu dropdown-menu-align-right">
<li v-for="action in actions">
<button
type="button"
@click="onClickAction(action.play_path)"
class="js-manual-action-link no-btn btn"
:class="{ 'disabled': !action.playable }"
:disabled="!action.playable">
@click="onClickAction(action.play_path)"
:class="{ 'disabled': isActionDisabled(action) }"
:disabled="isActionDisabled(action)">
${
playIconSvg
}
<span>
{{action.name}}
...
...
app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js
View file @
5197b011
...
...
@@ -38,6 +38,14 @@ export default {
new
Flash
(
'
An error occured while making the request.
'
);
});
},
isActionDisabled
(
action
)
{
if
(
action
.
playable
===
undefined
)
{
return
false
;
}
return
!
action
.
playable
;
},
},
template
:
`
...
...
@@ -51,8 +59,13 @@ export default {
aria-label="Manual job"
:disabled="isLoading">
${
playIconSvg
}
<i class="fa fa-caret-down" aria-hidden="true"></i>
<i v-if="isLoading" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
<i
class="fa fa-caret-down"
aria-hidden="true" />
<i
v-if="isLoading"
class="fa fa-spinner fa-spin"
aria-hidden="true" />
</button>
<ul class="dropdown-menu dropdown-menu-align-right">
...
...
@@ -60,9 +73,9 @@ export default {
<button
type="button"
class="js-pipeline-action-link no-btn btn"
:class="{ 'disabled': !action.playable }"
@click="onClickAction(action.path)"
:disabled="!action.playable">
:class="{ 'disabled': isActionDisabled(action) }"
:disabled="isActionDisabled(action)">
${
playIconSvg
}
<span>{{action.name}}</span>
</button>
...
...
spec/features/projects/environments/environments_spec.rb
View file @
5197b011
...
...
@@ -115,21 +115,6 @@ feature 'Environments page', :feature, :js do
.
not_to
change
{
Ci
::
Pipeline
.
count
}
end
scenario
'when action is non playable'
,
js:
true
do
given
(
:action
)
do
create
(
:ci_build
,
:manual
,
:non_playable
,
pipeline:
pipeline
,
name:
'close_app'
)
end
it
'has disabled button to the manual action'
do
find
(
'.js-dropdown-play-icon-container'
).
click
expect
(
page
).
to
have_button
(
'close_app'
,
disabled:
true
)
end
end
scenario
'does show build name and id'
do
expect
(
page
).
to
have_link
(
"
#{
build
.
name
}
#
#{
build
.
id
}
"
)
end
...
...
spec/features/projects/pipelines/pipelines_spec.rb
View file @
5197b011
...
...
@@ -197,24 +197,6 @@ describe 'Pipelines', :feature, :js do
end
end
context
'with non playable manual action'
do
let!
(
:manual
)
do
create
(
:ci_build
,
:manual
,
:non_playable
,
pipeline:
pipeline
,
name:
'manual build'
,
stage:
'test'
,
commands:
'test'
)
end
before
{
visit_project_pipelines
}
it
'has disabled button to the manual action'
do
find
(
'.js-pipeline-dropdown-manual-actions'
).
click
expect
(
page
).
to
have_button
(
'manual build'
,
disabled:
true
)
end
end
context
'for generic statuses'
do
context
'when running'
do
let!
(
:running
)
do
...
...
spec/javascripts/environments/environment_actions_spec.js
View file @
5197b011
...
...
@@ -19,6 +19,11 @@ describe('Actions Component', () => {
name
:
'
foo
'
,
play_path
:
'
#
'
,
},
{
name
:
'
foo bar
'
,
play_path
:
'
url
'
,
playable
:
false
,
},
];
spy
=
jasmine
.
createSpy
(
'
spy
'
).
and
.
returnValue
(
Promise
.
resolve
());
...
...
@@ -49,4 +54,14 @@ describe('Actions Component', () => {
expect
(
spy
).
toHaveBeenCalledWith
(
actionsMock
[
0
].
play_path
);
});
it
(
'
should render a disabled action when it
\'
s not playable
'
,
()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
.dropdown-menu li:last-child button
'
).
getAttribute
(
'
disabled
'
),
).
toEqual
(
'
disabled
'
);
expect
(
component
.
$el
.
querySelector
(
'
.dropdown-menu li:last-child button
'
).
classList
.
contains
(
'
disabled
'
),
).
toEqual
(
true
);
});
});
spec/javascripts/vue_pipelines_index/pipelines_actions_spec.js
View file @
5197b011
...
...
@@ -15,6 +15,11 @@ describe('Pipelines Actions dropdown', () => {
name
:
'
stop_review
'
,
path
:
'
/root/review-app/builds/1893/play
'
,
},
{
name
:
'
foo
'
,
path
:
'
#
'
,
playable
:
false
,
},
];
spy
=
jasmine
.
createSpy
(
'
spy
'
).
and
.
returnValue
(
Promise
.
resolve
());
...
...
@@ -59,4 +64,14 @@ describe('Pipelines Actions dropdown', () => {
expect
(
component
.
$el
.
querySelector
(
'
.fa-spinner
'
)).
toEqual
(
null
);
});
it
(
'
should render a disabled action when it
\'
s not playable
'
,
()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
.dropdown-menu li:last-child button
'
).
getAttribute
(
'
disabled
'
),
).
toEqual
(
'
disabled
'
);
expect
(
component
.
$el
.
querySelector
(
'
.dropdown-menu li:last-child button
'
).
classList
.
contains
(
'
disabled
'
),
).
toEqual
(
true
);
});
});
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