summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-25 10:20:53 +0100
committerRémy Coutable <remy@rymai.me>2016-11-25 10:20:53 +0100
commit525fb86b57c70cf8826054b571afd22623a5c903 (patch)
tree8fcd887c3504ba5caf169f5a489171908c34e0c7
parent6e798d2a10733b6f96ee83dd334366f23857cab1 (diff)
downloadgitlab-ce-525fb86b57c70cf8826054b571afd22623a5c903.tar.gz
Add missing trait and remove spec that doesn't make sense in this branch
The `repository_access_level` attribute doesn't exist in the 8-12-stable branch so repository access cannot be restricted using this feature. Fortunately we use `can?(user, :download_code, ref_project)` in lib/banzai/reference_parser/commit_parser.rb and lib/banzai/reference_parser/commit_range_parser.rb and this permission already exists in 8-12-stable (it only depends on the project `visibility_access`). Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--spec/factories/group_members.rb6
-rw-r--r--spec/lib/banzai/reference_parser/commit_parser_spec.rb8
-rw-r--r--spec/lib/banzai/reference_parser/commit_range_parser_spec.rb8
3 files changed, 6 insertions, 16 deletions
diff --git a/spec/factories/group_members.rb b/spec/factories/group_members.rb
index 2044ebec09a..795df5dfda9 100644
--- a/spec/factories/group_members.rb
+++ b/spec/factories/group_members.rb
@@ -3,5 +3,11 @@ FactoryGirl.define do
access_level { GroupMember::OWNER }
group
user
+
+ trait(:guest) { access_level GroupMember::GUEST }
+ trait(:reporter) { access_level GroupMember::REPORTER }
+ trait(:developer) { access_level GroupMember::DEVELOPER }
+ trait(:master) { access_level GroupMember::MASTER }
+ trait(:owner) { access_level GroupMember::OWNER }
end
end
diff --git a/spec/lib/banzai/reference_parser/commit_parser_spec.rb b/spec/lib/banzai/reference_parser/commit_parser_spec.rb
index 412ffa77c36..0b76d29fce0 100644
--- a/spec/lib/banzai/reference_parser/commit_parser_spec.rb
+++ b/spec/lib/banzai/reference_parser/commit_parser_spec.rb
@@ -8,14 +8,6 @@ describe Banzai::ReferenceParser::CommitParser, lib: true do
subject { described_class.new(project, user) }
let(:link) { empty_html_link }
- describe '#nodes_visible_to_user' do
- context 'when the link has a data-issue attribute' do
- before { link['data-commit'] = 123 }
-
- it_behaves_like "referenced feature visibility", "repository"
- end
- end
-
describe '#referenced_by' do
context 'when the link has a data-project attribute' do
before do
diff --git a/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb b/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
index 96e55b0997a..ba982f38542 100644
--- a/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
+++ b/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
@@ -8,14 +8,6 @@ describe Banzai::ReferenceParser::CommitRangeParser, lib: true do
subject { described_class.new(project, user) }
let(:link) { empty_html_link }
- describe '#nodes_visible_to_user' do
- context 'when the link has a data-issue attribute' do
- before { link['data-commit-range'] = '123..456' }
-
- it_behaves_like "referenced feature visibility", "repository"
- end
- end
-
describe '#referenced_by' do
context 'when the link has a data-project attribute' do
before do