diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-02 15:12:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-02 15:12:25 +0300 |
commit | d67ccb290ab5e54ff42f9cd464a132fc1d3067e1 (patch) | |
tree | 002a8f1b98a94a655638ce6ecbd079f4a758c8a0 /spec/helpers | |
parent | 157c4d9279f8ba1ad14debad9bdd017725bad316 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/groups_helper_spec.rb | 2 | ||||
-rw-r--r-- | spec/helpers/user_callouts_helper_spec.rb | 14 | ||||
-rw-r--r-- | spec/helpers/wiki_helper_spec.rb | 6 |
3 files changed, 4 insertions, 18 deletions
diff --git a/spec/helpers/groups_helper_spec.rb b/spec/helpers/groups_helper_spec.rb index 4d647696130..8859ed27022 100644 --- a/spec/helpers/groups_helper_spec.rb +++ b/spec/helpers/groups_helper_spec.rb @@ -92,7 +92,7 @@ RSpec.describe GroupsHelper do shared_examples 'correct ancestor order' do it 'outputs the groups in the correct order' do expect(subject) - .to match(%r{<li style="text-indent: 16px;"><a.*>#{deep_nested_group.name}.*</li>.*<a.*>#{very_deep_nested_group.name}</a>}m) + .to match(%r{<li><a.*>#{deep_nested_group.name}.*</li>.*<a.*>#{very_deep_nested_group.name}</a>}m) end end diff --git a/spec/helpers/user_callouts_helper_spec.rb b/spec/helpers/user_callouts_helper_spec.rb index f738ba855b8..7abc67e29a4 100644 --- a/spec/helpers/user_callouts_helper_spec.rb +++ b/spec/helpers/user_callouts_helper_spec.rb @@ -216,20 +216,6 @@ RSpec.describe UserCalloutsHelper do context 'when the invite_members_banner has not been dismissed' do it { is_expected.to eq(true) } - context 'when a user has dismissed this banner via cookies already' do - before do - helper.request.cookies["invite_#{group.id}_#{user.id}"] = 'true' - end - - it { is_expected.to eq(false) } - - it 'creates the callout from cookie', :aggregate_failures do - expect { subject }.to change { Users::GroupCallout.count }.by(1) - expect(Users::GroupCallout.last).to have_attributes(group_id: group.id, - feature_name: described_class::INVITE_MEMBERS_BANNER) - end - end - context 'when the group was just created' do before do flash[:notice] = "Group #{group.name} was successfully created" diff --git a/spec/helpers/wiki_helper_spec.rb b/spec/helpers/wiki_helper_spec.rb index dc76f92db1b..0d04ca2b876 100644 --- a/spec/helpers/wiki_helper_spec.rb +++ b/spec/helpers/wiki_helper_spec.rb @@ -8,7 +8,7 @@ RSpec.describe WikiHelper do it 'sets the title for the show action' do expect(helper).to receive(:breadcrumb_title).with(page.human_title) - expect(helper).to receive(:wiki_breadcrumb_dropdown_links).with(page.slug) + expect(helper).to receive(:wiki_breadcrumb_collapsed_links).with(page.slug) expect(helper).to receive(:page_title).with(page.human_title, 'Wiki') expect(helper).to receive(:add_to_breadcrumbs).with('Wiki', helper.wiki_path(page.wiki)) @@ -17,7 +17,7 @@ RSpec.describe WikiHelper do it 'sets the title for a custom action' do expect(helper).to receive(:breadcrumb_title).with(page.human_title) - expect(helper).to receive(:wiki_breadcrumb_dropdown_links).with(page.slug) + expect(helper).to receive(:wiki_breadcrumb_collapsed_links).with(page.slug) expect(helper).to receive(:page_title).with('Edit', page.human_title, 'Wiki') expect(helper).to receive(:add_to_breadcrumbs).with('Wiki', helper.wiki_path(page.wiki)) @@ -27,7 +27,7 @@ RSpec.describe WikiHelper do it 'sets the title for an unsaved page' do expect(page).to receive(:persisted?).and_return(false) expect(helper).not_to receive(:breadcrumb_title) - expect(helper).not_to receive(:wiki_breadcrumb_dropdown_links) + expect(helper).not_to receive(:wiki_breadcrumb_collapsed_links) expect(helper).to receive(:page_title).with('Wiki') expect(helper).to receive(:add_to_breadcrumbs).with('Wiki', helper.wiki_path(page.wiki)) |