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
Jérome Perrin
gitlab-ce
Commits
c3db10d3
Commit
c3db10d3
authored
Nov 07, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes loading assertions
parent
a8508608
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
20 deletions
+1
-20
app/assets/javascripts/environments/components/environment_item.js.es6
...vascripts/environments/components/environment_item.js.es6
+1
-1
app/assets/javascripts/environments/environments_bundle.js.es6
...ssets/javascripts/environments/environments_bundle.js.es6
+0
-1
spec/features/environments_spec.rb
spec/features/environments_spec.rb
+0
-18
No files found.
app/assets/javascripts/environments/components/environment_item.js.es6
View file @
c3db10d3
...
...
@@ -86,7 +86,7 @@
* Verifies is the given environment has manual actions.
* Used to verify if we should render them or nor.
*
* @returns {Boolean}
description
* @returns {Boolean}
*/
hasManualActions() {
return this.$options.hasKey(this.model, 'manual_actions') && this.model.manual_actions.length;
...
...
app/assets/javascripts/environments/environments_bundle.js.es6
View file @
c3db10d3
...
...
@@ -31,7 +31,6 @@ $(() => {
return fn(item);
}).filter(Boolean);
gl.EnvironmentsListApp = new Vue({
el: '#environments-list-view',
...
...
spec/features/environments_spec.rb
View file @
c3db10d3
...
...
@@ -13,31 +13,13 @@ feature 'Environments', feature: true, js:true do
project
.
team
<<
[
user
,
role
]
end
describe
'Loading environments'
do
given!
(
:environment
)
{
}
given!
(
:deployment
)
{
}
given!
(
:manual
)
{
}
context
'loading environments'
do
before
do
visit
namespace_project_environments_path
(
project
.
namespace
,
project
)
end
scenario
'does show loading spinner'
do
expect
(
page
).
to
have_selector
(
'.environments-list-loading'
)
end
end
end
describe
'when showing environments'
do
before
do
visit
namespace_project_environments_path
(
project
.
namespace
,
project
)
wait_for_vue_resource
end
context
'without environments'
do
scenario
'does show "Available" and "Stopped" tab with links'
do
expect
(
page
).
to
have_link
(
'Available'
)
expect
(
page
).
to
have_link
(
'Stopped'
)
...
...
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