Merge branch 'ss/fix-epic-spec' into 'master'

Fix quarantined rspec in ee/epic_show.rb

See merge request gitlab-org/gitlab!57298

app/assets/javascripts/notes/components/sort_discussion.vue

@@ -49,18 +49,17 @@ export default {
 </script>
 
 <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
       :value="sortDirection"
       :storage-key="storageKey"
       :persist="persistSortOrder"
       @input="setDiscussionSortDirection({ direction: $event })"
     />
-    <gl-dropdown
-      :text="dropdownText"
-      data-testid="sort-discussion-filter"
-      class="js-dropdown-text full-width-mobile"
-    >
+    <gl-dropdown :text="dropdownText" class="js-dropdown-text full-width-mobile">
       <gl-dropdown-item
         v-for="{ text, key, cls } in $options.SORT_OPTIONS"
         :key="key"

ee/spec/features/epics/epic_show_spec.rb

@@ -165,11 +165,7 @@ RSpec.describe 'Epic show', :js do
           end
         end
 
-        it 'shows comments in the correct order', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/225637' do
-          page.within('[data-testid="sort-discussion-filter"]') do
-            expect(find('.js-newest-first')).to have_content('Newest first')
-          end
-
+        it 'shows comments in the correct order' do
           items = all('.timeline-entry .timeline-discussion-body .note-text')
           expect(items[0]).to have_content(notes[1].note)
           expect(items[1]).to have_content(notes[0].note)