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
d5e91071
Commit
d5e91071
authored
Jun 11, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update MrWidgetAuthorTime and MRWidgetMerged spec
parent
927d2459
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js
...ts/vue_mr_widget/components/mr_widget_author_time_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
.../vue_mr_widget/components/states/mr_widget_merged_spec.js
+1
-1
No files found.
spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js
View file @
d5e91071
...
...
@@ -34,7 +34,7 @@ describe('MrWidgetAuthorTime', () => {
});
it
(
'
renders provided time
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
time
'
).
getAttribute
(
'
title
'
)).
toEqual
(
'
2017-03-23T23:02:00.807Z
'
);
expect
(
vm
.
$el
.
querySelector
(
'
time
'
).
getAttribute
(
'
data-original-
title
'
)).
toEqual
(
'
2017-03-23T23:02:00.807Z
'
);
expect
(
vm
.
$el
.
querySelector
(
'
time
'
).
textContent
.
trim
()).
toEqual
(
'
12 hours ago
'
);
});
});
spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
View file @
d5e91071
...
...
@@ -186,7 +186,7 @@ describe('MRWidgetMerged', () => {
it
(
'
should use mergedEvent mergedAt as tooltip title
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
time
'
).
getAttribute
(
'
title
'
),
vm
.
$el
.
querySelector
(
'
time
'
).
getAttribute
(
'
data-original-
title
'
),
).
toBe
(
'
Jan 24, 2018 1:02pm GMT+0000
'
);
});
});
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