diff options
author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-11-24 20:02:07 -0300 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-11-24 20:02:07 -0300 |
commit | defa0f99f18e7634b5d6525f438b926ee3d98dad (patch) | |
tree | 7854ddb1dfdf90276a48f0929b873a5c3f916237 /spec | |
parent | 35b09f59e7a80540bb985ef70dff6f6be71a3cc6 (diff) | |
download | gitlab-ce-defa0f99f18e7634b5d6525f438b926ee3d98dad.tar.gz |
Revert "Merge branch '22481-honour-issue-visibility-for-groups' into 'security'
"
This reverts commit 5614d724b56be96850b95bfe50d9b07515550763.
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/groups/issues_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/groups/merge_requests_spec.rb | 8 | ||||
-rw-r--r-- | spec/models/concerns/issuable_spec.rb | 5 | ||||
-rw-r--r-- | spec/support/project_features_apply_to_issuables_shared_examples.rb | 56 |
4 files changed, 0 insertions, 77 deletions
diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb deleted file mode 100644 index 476eca17a9d..00000000000 --- a/spec/features/groups/issues_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'spec_helper' - -feature 'Group issues page', feature: true do - let(:path) { issues_group_path(group) } - let(:issuable) { create(:issue, project: project, title: "this is my created issuable")} - - include_examples 'project features apply to issuables', Issue -end diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb deleted file mode 100644 index a2791b57544..00000000000 --- a/spec/features/groups/merge_requests_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'spec_helper' - -feature 'Group merge requests page', feature: true do - let(:path) { merge_requests_group_path(group) } - let(:issuable) { create(:merge_request, source_project: project, target_project: project, title: "this is my created issuable")} - - include_examples 'project features apply to issuables', MergeRequest -end diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb index 28e5cccb832..60e4bbc8564 100644 --- a/spec/models/concerns/issuable_spec.rb +++ b/spec/models/concerns/issuable_spec.rb @@ -97,11 +97,6 @@ describe Issue, "Issuable" do end end - describe '.to_ability_name' do - it { expect(Issue.to_ability_name).to eq("issue") } - it { expect(MergeRequest.to_ability_name).to eq("merge_request") } - end - describe "#today?" do it "returns true when created today" do # Avoid timezone differences and just return exactly what we want diff --git a/spec/support/project_features_apply_to_issuables_shared_examples.rb b/spec/support/project_features_apply_to_issuables_shared_examples.rb deleted file mode 100644 index 4621d17549b..00000000000 --- a/spec/support/project_features_apply_to_issuables_shared_examples.rb +++ /dev/null @@ -1,56 +0,0 @@ -shared_examples 'project features apply to issuables' do |klass| - let(:described_class) { klass } - - let(:group) { create(:group) } - let(:user_in_group) { create(:group_member, :developer, user: create(:user), group: group ).user } - let(:user_outside_group) { create(:user) } - - let(:project) { create(:empty_project, :public, project_args) } - - def project_args - feature = "#{described_class.model_name.plural}_access_level".to_sym - - args = { group: group } - args[feature] = access_level - - args - end - - before do - _ = issuable - login_as(user) - visit path - end - - context 'public access level' do - let(:access_level) { ProjectFeature::ENABLED } - - context 'group member' do - let(:user) { user_in_group } - - it { expect(page).to have_content(issuable.title) } - end - - context 'non-member' do - let(:user) { user_outside_group } - - it { expect(page).to have_content(issuable.title) } - end - end - - context 'private access level' do - let(:access_level) { ProjectFeature::PRIVATE } - - context 'group member' do - let(:user) { user_in_group } - - it { expect(page).to have_content(issuable.title) } - end - - context 'non-member' do - let(:user) { user_outside_group } - - it { expect(page).not_to have_content(issuable.title) } - end - end -end |