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
Boxiang Sun
gitlab-ce
Commits
5cad1401
Commit
5cad1401
authored
Mar 28, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken test
parent
76119cb1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/assets/javascripts/environments/components/environment_item.js
...s/javascripts/environments/components/environment_item.js
+1
-1
spec/javascripts/environments/environment_spec.js
spec/javascripts/environments/environment_spec.js
+1
-1
No files found.
app/assets/javascripts/environments/components/environment_item.js
View file @
5cad1401
...
@@ -425,7 +425,7 @@ export default {
...
@@ -425,7 +425,7 @@ export default {
},
},
template
:
`
template
:
`
<tr>
<tr
:class="{ 'js-child-row': model.isChildren }"
>
<td>
<td>
<a v-if="!model.isFolder"
<a v-if="!model.isFolder"
class="environment-name"
class="environment-name"
...
...
spec/javascripts/environments/environment_spec.js
View file @
5cad1401
...
@@ -262,7 +262,7 @@ describe('Environment', () => {
...
@@ -262,7 +262,7 @@ describe('Environment', () => {
// wait for next async request
// wait for next async request
setTimeout
(()
=>
{
setTimeout
(()
=>
{
expect
(
component
.
$el
.
querySelectorAll
(
'
.child-row
'
).
length
).
toEqual
(
1
);
expect
(
component
.
$el
.
querySelectorAll
(
'
.
js-
child-row
'
).
length
).
toEqual
(
1
);
expect
(
component
.
$el
.
querySelector
(
'
td.text-center > a.btn
'
).
textContent
).
toContain
(
'
Show all
'
);
expect
(
component
.
$el
.
querySelector
(
'
td.text-center > a.btn
'
).
textContent
).
toContain
(
'
Show all
'
);
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
folderInterceptor
);
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
folderInterceptor
);
...
...
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