diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-07-19 23:05:27 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 15:55:52 +0300 |
commit | 693081cc0df73b841205e5600db5083418654dcc (patch) | |
tree | 0dc18e943ddd46ea9377ed3f70f057f9ae246996 /spec | |
parent | 94ebe0f81b96d5a035b9548d7e25d90197867867 (diff) |
Merge branch 'rs-issue-19878' into 'master'
Ensure Owners are included in the scope for authorized_projects
Prior, when providing a `min_access_level` parameter to this method, we
called `Gitlab::Access.values` instead of `all_values`, mistakenly
omitting the `OWNER` level.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19878
See merge request !5353
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/user_spec.rb | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index fc74488ac0e..3bf82cf2668 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -887,16 +887,25 @@ describe User, models: true do end describe '#authorized_projects' do - let!(:user) { create(:user) } - let!(:private_project) { create(:project, :private) } + context 'with a minimum access level' do + it 'includes projects for which the user is an owner' do + user = create(:user) + project = create(:empty_project, :private, namespace: user.namespace) - before do - private_project.team << [user, Gitlab::Access::MASTER] - end + expect(user.authorized_projects(Gitlab::Access::REPORTER)) + .to contain_exactly(project) + end - subject { user.authorized_projects } + it 'includes projects for which the user is a master' do + user = create(:user) + project = create(:empty_project, :private) + + project.team << [user, Gitlab::Access::MASTER] - it { is_expected.to eq([private_project]) } + expect(user.authorized_projects(Gitlab::Access::REPORTER)) + .to contain_exactly(project) + end + end end describe '#ci_authorized_runners' do |