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
8cf1fedd
Commit
8cf1fedd
authored
Oct 30, 2020
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed failing Jest specs
Fixed failing specs due to template changes
parent
42428923
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
spec/frontend/diffs/components/tree_list_spec.js
spec/frontend/diffs/components/tree_list_spec.js
+3
-3
spec/frontend/vue_shared/components/__snapshots__/file_row_header_spec.js.snap
...red/components/__snapshots__/file_row_header_spec.js.snap
+12
-12
No files found.
spec/frontend/diffs/components/tree_list_spec.js
View file @
8cf1fedd
...
@@ -91,12 +91,12 @@ describe('Diffs tree list component', () => {
...
@@ -91,12 +91,12 @@ describe('Diffs tree list component', () => {
expect
(
expect
(
getFileRows
()
getFileRows
()
.
at
(
0
)
.
at
(
0
)
.
text
(),
.
html
(),
).
toContain
(
'
index.js
'
);
).
toContain
(
'
index.js
'
);
expect
(
expect
(
getFileRows
()
getFileRows
()
.
at
(
1
)
.
at
(
1
)
.
text
(),
.
html
(),
).
toContain
(
'
app
'
);
).
toContain
(
'
app
'
);
});
});
...
@@ -138,7 +138,7 @@ describe('Diffs tree list component', () => {
...
@@ -138,7 +138,7 @@ describe('Diffs tree list component', () => {
wrapper
.
vm
.
$store
.
state
.
diffs
.
renderTreeList
=
false
;
wrapper
.
vm
.
$store
.
state
.
diffs
.
renderTreeList
=
false
;
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
expect
(
wrapper
.
find
(
'
.file-row
'
).
text
()).
toContain
(
'
index.js
'
);
expect
(
wrapper
.
find
(
'
.file-row
'
).
html
()).
toContain
(
'
index.js
'
);
});
});
});
});
});
});
...
...
spec/frontend/vue_shared/components/__snapshots__/file_row_header_spec.js.snap
View file @
8cf1fedd
...
@@ -5,11 +5,11 @@ exports[`File row header component adds multiple ellipsises after 40 characters
...
@@ -5,11 +5,11 @@ exports[`File row header component adds multiple ellipsises after 40 characters
class="file-row-header bg-white sticky-top p-2 js-file-row-header"
class="file-row-header bg-white sticky-top p-2 js-file-row-header"
title="app/assets/javascripts/merge_requests/widget/diffs/notes"
title="app/assets/javascripts/merge_requests/widget/diffs/notes"
>
>
<
span
<
gl-truncate-stub
class="bold"
class="bold"
>
position="middle"
app/assets/javascripts/…/…/diffs/notes
text="app/assets/javascripts/merge_requests/widget/diffs/notes"
</span
>
/
>
</div>
</div>
`;
`;
...
@@ -18,11 +18,11 @@ exports[`File row header component renders file path 1`] = `
...
@@ -18,11 +18,11 @@ exports[`File row header component renders file path 1`] = `
class="file-row-header bg-white sticky-top p-2 js-file-row-header"
class="file-row-header bg-white sticky-top p-2 js-file-row-header"
title="app/assets"
title="app/assets"
>
>
<
span
<
gl-truncate-stub
class="bold"
class="bold"
>
position="middle"
app/assets
text="app/assets"
</span
>
/
>
</div>
</div>
`;
`;
...
@@ -31,10 +31,10 @@ exports[`File row header component trucates path after 40 characters 1`] = `
...
@@ -31,10 +31,10 @@ exports[`File row header component trucates path after 40 characters 1`] = `
class="file-row-header bg-white sticky-top p-2 js-file-row-header"
class="file-row-header bg-white sticky-top p-2 js-file-row-header"
title="app/assets/javascripts/merge_requests"
title="app/assets/javascripts/merge_requests"
>
>
<
span
<
gl-truncate-stub
class="bold"
class="bold"
>
position="middle"
app/assets/javascripts/merge_requests
text="app/assets/javascripts/merge_requests"
</span
>
/
>
</div>
</div>
`;
`;
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