diff options
Diffstat (limited to 'spec/views/projects/merge_requests')
4 files changed, 4 insertions, 29 deletions
diff --git a/spec/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml_spec.rb b/spec/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml_spec.rb index 416f4253e1b..99339e956cc 100644 --- a/spec/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml_spec.rb @@ -19,7 +19,7 @@ RSpec.describe 'projects/merge_requests/_close_reopen_draft_report_toggle.html.h render - expect(rendered).to have_css('li', class: 'js-sidebar-subscriptions-entry-point') + expect(rendered).to have_css('li', class: 'js-sidebar-subscriptions-widget-root') end end @@ -27,7 +27,7 @@ RSpec.describe 'projects/merge_requests/_close_reopen_draft_report_toggle.html.h it 'is not present' do render - expect(rendered).not_to have_css('li', class: 'js-sidebar-subscriptions-entry-point') + expect(rendered).not_to have_css('li', class: 'js-sidebar-subscriptions-widget-root') end end end diff --git a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb index f0273c1716f..90ee6638142 100644 --- a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb @@ -39,16 +39,4 @@ RSpec.describe 'projects/merge_requests/_commits.html.haml', :sidekiq_might_not_ expect(rendered).to have_css('.gpg-status-box') end - - context 'when there are hidden commits' do - before do - assign(:hidden_commit_count, 1) - end - - it 'shows notice about omitted commits' do - render - - expect(rendered).to match(/1 additional commit has been omitted to prevent performance issues/) - end - end end diff --git a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb index 038a94fe7c3..feb82e6a2b2 100644 --- a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb @@ -35,17 +35,4 @@ RSpec.describe 'projects/merge_requests/creations/_new_submit.html.haml' do expect(rendered).not_to have_text('Builds') end end - - context 'when there are hidden commits' do - before do - assign(:pipelines, Ci::Pipeline.none) - assign(:hidden_commit_count, 2) - end - - it 'shows notice about omitted commits' do - render - - expect(rendered).to match(/2 additional commits have been omitted to prevent performance issues/) - end - end end diff --git a/spec/views/projects/merge_requests/edit.html.haml_spec.rb b/spec/views/projects/merge_requests/edit.html.haml_spec.rb index 215d404e395..75956160c0a 100644 --- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb @@ -45,7 +45,7 @@ RSpec.describe 'projects/merge_requests/edit.html.haml' do expect(rendered).to have_field('merge_request[title]') expect(rendered).to have_field('merge_request[description]') expect(rendered).to have_selector('input[name="merge_request[label_ids][]"]', visible: false) - expect(rendered).to have_selector('#merge_request_milestone_id', visible: false) + expect(rendered).to have_selector('.js-milestone-dropdown-root') expect(rendered).not_to have_selector('#merge_request_target_branch', visible: false) end end @@ -57,7 +57,7 @@ RSpec.describe 'projects/merge_requests/edit.html.haml' do expect(rendered).to have_field('merge_request[title]') expect(rendered).to have_field('merge_request[description]') expect(rendered).to have_selector('input[name="merge_request[label_ids][]"]', visible: false) - expect(rendered).to have_selector('#merge_request_milestone_id', visible: false) + expect(rendered).to have_selector('.js-milestone-dropdown-root') expect(rendered).to have_selector('#merge_request_target_branch', visible: false) end end |