diff options
author | Michael Kozono <mkozono@gmail.com> | 2017-09-05 23:49:57 -0700 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2017-09-06 12:07:21 -0700 |
commit | f03b90c6a370e15ed21f82df1501d5fc58b0f4ec (patch) | |
tree | 0a2f8f2967dad9fc89b216ab3a4b877b3fd96af6 /spec | |
parent | 5404dbb49d4064f7ff3b74ea229edb43f01fd699 (diff) | |
download | gitlab-ce-f03b90c6a370e15ed21f82df1501d5fc58b0f4ec.tar.gz |
Link or not link depending on permissions
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/groups_helper_spec.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/spec/helpers/groups_helper_spec.rb b/spec/helpers/groups_helper_spec.rb index edfa3d9ae5a..7c5d954763c 100644 --- a/spec/helpers/groups_helper_spec.rb +++ b/spec/helpers/groups_helper_spec.rb @@ -107,9 +107,9 @@ describe GroupsHelper do let(:possible_help_texts) do { default_help: "This setting will be applied to all subgroups unless overridden by a group owner", - ancestor_locked_but_you_can_override: /This setting is applied on <a .+>.+<\/a>\. You can override the setting or <a .+>remove the share lock from .+<\/a>/, - ancestor_locked_so_ask_the_owner: /This setting is applied on <a .+>.+<\/a>\. To share projects in this group with another group, ask the owner to override the setting or remove the share lock from <a .+>.+<\/a>/, - ancestor_locked_and_has_been_overridden: /This setting is applied on <a .+>.+<\/a> and has been overridden on this subgroup/ + ancestor_locked_but_you_can_override: /This setting is applied on <a .+>.+<\/a>\. You can override the setting or .+/, + ancestor_locked_so_ask_the_owner: /This setting is applied on .+\. To share projects in this group with another group, ask the owner to override the setting or remove the share lock from .+/, + ancestor_locked_and_has_been_overridden: /This setting is applied on .+ and has been overridden on this subgroup/ } end let(:possible_linked_ancestors) do @@ -170,6 +170,16 @@ describe GroupsHelper do allow(helper).to receive(:can?) .with(users[current_user], :change_share_with_group_lock, subgroup) .and_return(Ability.allowed?(users[current_user], :change_share_with_group_lock, subgroup)) + + ancestor = possible_linked_ancestors[linked_ancestor] + if ancestor + allow(helper).to receive(:can?) + .with(users[current_user], :read_group, ancestor) + .and_return(Ability.allowed?(users[current_user], :read_group, ancestor)) + allow(helper).to receive(:can?) + .with(users[current_user], :admin_group, ancestor) + .and_return(Ability.allowed?(users[current_user], :admin_group, ancestor)) + end end it 'has the correct help text with correct ancestor links' do |