Commit 54e802e8 authored by Jan Provaznik's avatar Jan Provaznik

Merge branch '322755-turn-vue_issuables_list-off-for-feature-specs' into 'master'

Turn `vue_issuables_list` FF off for feature specs

See merge request gitlab-org/gitlab!61627
parents 532d53c4 45d7929d
......@@ -6,7 +6,7 @@
- issuable_mr = @issuable_meta_data[issuable.id].merge_requests_count
- if issuable_mr > 0
%li.issuable-mr.gl-display-none.gl-sm-display-block.has-tooltip{ title: _('Related merge requests') }
%li.issuable-mr.gl-display-none.gl-sm-display-block.has-tooltip{ title: _('Related merge requests'), data: { testid: 'merge-requests' } }
= sprite_icon('merge-request', css_class: "gl-vertical-align-middle")
= issuable_mr
......
- issue = local_assigns.fetch(:issue)
- if issue.weight
%span.issuable-weight.gl-display-none.d-sm-inline-block.gl-mr-2.has-tooltip{ data: { container: 'body', qa_selector: 'issuable_weight_content' }, title: _('Weight') }
%span.issuable-weight.gl-display-none.d-sm-inline-block.gl-mr-2.has-tooltip{ data: { container: 'body', qa_selector: 'issuable_weight_content', testid: 'weight' }, title: _('Weight') }
 
= sprite_icon('weight', css_class: 'issue-weight-icon')
= issue.weight
......@@ -217,7 +217,7 @@ RSpec.describe 'Group issues page' do
it 'first pagination item is active' do
page.within('.gl-pagination') do
expect(find('.active')).to have_content('1')
expect(find('li.active')).to have_content('1')
end
end
end
......
......@@ -330,7 +330,7 @@ RSpec.describe 'Filter issues', :js do
context 'issue label clicked' do
it 'filters and displays in search bar' do
find('[data-qa-selector="issuable-label"]', text: multiple_words_label.title).click
click_link multiple_words_label.title
expect_issues_list_count(1)
expect_tokens([label_token("\"#{multiple_words_label.title}\"")])
......
......@@ -9,6 +9,8 @@ RSpec.describe 'Service Desk Issue Tracker', :js do
let_it_be(:support_bot) { User.support_bot }
before do
stub_feature_flags(vue_issuables_list: true)
# The following two conditions equate to Gitlab::ServiceDesk.supported == true
allow(Gitlab::IncomingEmail).to receive(:enabled?).and_return(true)
allow(Gitlab::IncomingEmail).to receive(:supports_wildcard?).and_return(true)
......
......@@ -269,9 +269,10 @@ RSpec.configure do |config|
stub_feature_flags(unified_diff_components: false)
# The following `vue_issues_list` stub can be removed once the
# Vue issues page has feature parity with the current Haml page
# The following `vue_issues_list`/`vue_issuables_list` stubs can be removed
# once the Vue issues page has feature parity with the current Haml page
stub_feature_flags(vue_issues_list: false)
stub_feature_flags(vue_issuables_list: false)
# Disable `refactor_blob_viewer` as we refactor
# the blob viewer. See the follwing epic for more:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment