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
afd13eb6
Commit
afd13eb6
authored
Mar 26, 2021
by
Scott Stern
Committed by
Phil Hughes
Mar 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix quarantined rspec in ee/epic_show.rb
parent
05a6be0c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
11 deletions
+6
-11
app/assets/javascripts/notes/components/sort_discussion.vue
app/assets/javascripts/notes/components/sort_discussion.vue
+5
-6
ee/spec/features/epics/epic_show_spec.rb
ee/spec/features/epics/epic_show_spec.rb
+1
-5
No files found.
app/assets/javascripts/notes/components/sort_discussion.vue
View file @
afd13eb6
...
@@ -49,18 +49,17 @@ export default {
...
@@ -49,18 +49,17 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"gl-mr-3 gl-display-inline-block gl-vertical-align-bottom full-width-mobile"
>
<div
data-testid=
"sort-discussion-filter"
class=
"gl-mr-3 gl-display-inline-block gl-vertical-align-bottom full-width-mobile"
>
<local-storage-sync
<local-storage-sync
:value=
"sortDirection"
:value=
"sortDirection"
:storage-key=
"storageKey"
:storage-key=
"storageKey"
:persist=
"persistSortOrder"
:persist=
"persistSortOrder"
@
input=
"setDiscussionSortDirection(
{ direction: $event })"
@
input=
"setDiscussionSortDirection(
{ direction: $event })"
/>
/>
<gl-dropdown
<gl-dropdown
:text=
"dropdownText"
class=
"js-dropdown-text full-width-mobile"
>
:text=
"dropdownText"
data-testid=
"sort-discussion-filter"
class=
"js-dropdown-text full-width-mobile"
>
<gl-dropdown-item
<gl-dropdown-item
v-for=
"
{ text, key, cls } in $options.SORT_OPTIONS"
v-for=
"
{ text, key, cls } in $options.SORT_OPTIONS"
:key="key"
:key="key"
...
...
ee/spec/features/epics/epic_show_spec.rb
View file @
afd13eb6
...
@@ -165,11 +165,7 @@ RSpec.describe 'Epic show', :js do
...
@@ -165,11 +165,7 @@ RSpec.describe 'Epic show', :js do
end
end
end
end
it
'shows comments in the correct order'
,
quarantine:
'https://gitlab.com/gitlab-org/gitlab/-/issues/225637'
do
it
'shows comments in the correct order'
do
page
.
within
(
'[data-testid="sort-discussion-filter"]'
)
do
expect
(
find
(
'.js-newest-first'
)).
to
have_content
(
'Newest first'
)
end
items
=
all
(
'.timeline-entry .timeline-discussion-body .note-text'
)
items
=
all
(
'.timeline-entry .timeline-discussion-body .note-text'
)
expect
(
items
[
0
]).
to
have_content
(
notes
[
1
].
note
)
expect
(
items
[
0
]).
to
have_content
(
notes
[
1
].
note
)
expect
(
items
[
1
]).
to
have_content
(
notes
[
0
].
note
)
expect
(
items
[
1
]).
to
have_content
(
notes
[
0
].
note
)
...
...
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