diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 00:09:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 00:09:08 +0300 |
commit | 866ca4e49ff74ffadf8e6f6ff663a168489c2aba (patch) | |
tree | cc3135b1bae11dbd1cb3a30cb547473ad89a5551 /spec/features | |
parent | 26a50872e9da9509c52c70f74dc21698fec906db (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
6 files changed, 38 insertions, 38 deletions
diff --git a/spec/features/security/group/internal_access_spec.rb b/spec/features/security/group/internal_access_spec.rb index 8dd15789cd1..114bc1a1f0c 100644 --- a/spec/features/security/group/internal_access_spec.rb +++ b/spec/features/security/group/internal_access_spec.rb @@ -36,7 +36,7 @@ describe 'Internal Group access' do it { is_expected.to be_denied_for(:visitor) } end - describe 'GET /groups/:path/issues' do + describe 'GET /groups/:path/-/issues' do subject { issues_group_path(group) } it { is_expected.to be_allowed_for(:admin) } @@ -51,7 +51,7 @@ describe 'Internal Group access' do it { is_expected.to be_denied_for(:visitor) } end - describe 'GET /groups/:path/merge_requests' do + describe 'GET /groups/:path/-/merge_requests' do let(:project) { create(:project, :internal, :repository, group: group) } subject { merge_requests_group_path(group) } @@ -68,7 +68,7 @@ describe 'Internal Group access' do it { is_expected.to be_denied_for(:visitor) } end - describe 'GET /groups/:path/group_members' do + describe 'GET /groups/:path/-/group_members' do subject { group_group_members_path(group) } it { is_expected.to be_allowed_for(:admin) } @@ -83,7 +83,7 @@ describe 'Internal Group access' do it { is_expected.to be_denied_for(:visitor) } end - describe 'GET /groups/:path/edit' do + describe 'GET /groups/:path/-/edit' do subject { edit_group_path(group) } it { is_expected.to be_allowed_for(:admin) } diff --git a/spec/features/security/group/private_access_spec.rb b/spec/features/security/group/private_access_spec.rb index 0720302b03b..3362b9a9e9e 100644 --- a/spec/features/security/group/private_access_spec.rb +++ b/spec/features/security/group/private_access_spec.rb @@ -36,7 +36,7 @@ describe 'Private Group access' do it { is_expected.to be_denied_for(:visitor) } end - describe 'GET /groups/:path/issues' do + describe 'GET /groups/:path/-/issues' do subject { issues_group_path(group) } it { is_expected.to be_allowed_for(:admin) } @@ -51,7 +51,7 @@ describe 'Private Group access' do it { is_expected.to be_denied_for(:visitor) } end - describe 'GET /groups/:path/merge_requests' do + describe 'GET /groups/:path/-/merge_requests' do let(:project) { create(:project, :private, :repository, group: group) } subject { merge_requests_group_path(group) } @@ -68,7 +68,7 @@ describe 'Private Group access' do it { is_expected.to be_denied_for(:visitor) } end - describe 'GET /groups/:path/group_members' do + describe 'GET /groups/:path/-/group_members' do subject { group_group_members_path(group) } it { is_expected.to be_allowed_for(:admin) } @@ -83,7 +83,7 @@ describe 'Private Group access' do it { is_expected.to be_denied_for(:visitor) } end - describe 'GET /groups/:path/edit' do + describe 'GET /groups/:path/-/edit' do subject { edit_group_path(group) } it { is_expected.to be_allowed_for(:admin) } diff --git a/spec/features/security/group/public_access_spec.rb b/spec/features/security/group/public_access_spec.rb index 0a18a0ff812..bf05f276cc6 100644 --- a/spec/features/security/group/public_access_spec.rb +++ b/spec/features/security/group/public_access_spec.rb @@ -36,7 +36,7 @@ describe 'Public Group access' do it { is_expected.to be_allowed_for(:visitor) } end - describe 'GET /groups/:path/issues' do + describe 'GET /groups/:path/-/issues' do subject { issues_group_path(group) } it { is_expected.to be_allowed_for(:admin) } @@ -51,7 +51,7 @@ describe 'Public Group access' do it { is_expected.to be_allowed_for(:visitor) } end - describe 'GET /groups/:path/merge_requests' do + describe 'GET /groups/:path/-/merge_requests' do let(:project) { create(:project, :public, :repository, group: group) } subject { merge_requests_group_path(group) } @@ -68,7 +68,7 @@ describe 'Public Group access' do it { is_expected.to be_allowed_for(:visitor) } end - describe 'GET /groups/:path/group_members' do + describe 'GET /groups/:path/-/group_members' do subject { group_group_members_path(group) } it { is_expected.to be_allowed_for(:admin) } @@ -83,7 +83,7 @@ describe 'Public Group access' do it { is_expected.to be_allowed_for(:visitor) } end - describe 'GET /groups/:path/edit' do + describe 'GET /groups/:path/-/edit' do subject { edit_group_path(group) } it { is_expected.to be_allowed_for(:admin) } diff --git a/spec/features/security/project/internal_access_spec.rb b/spec/features/security/project/internal_access_spec.rb index 5c74b566ef0..ed1dbe15d65 100644 --- a/spec/features/security/project/internal_access_spec.rb +++ b/spec/features/security/project/internal_access_spec.rb @@ -29,7 +29,7 @@ describe "Internal Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/tree/master" do + describe "GET /:project_path/-/tree/master" do subject { project_tree_path(project, project.repository.root_ref) } it { is_expected.to be_allowed_for(:admin) } @@ -43,7 +43,7 @@ describe "Internal Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/commits/master" do + describe "GET /:project_path/-/commits/master" do subject { project_commits_path(project, project.repository.root_ref, limit: 1) } it { is_expected.to be_allowed_for(:admin) } @@ -57,7 +57,7 @@ describe "Internal Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/commit/:sha" do + describe "GET /:project_path/-/commit/:sha" do subject { project_commit_path(project, project.repository.commit) } it { is_expected.to be_allowed_for(:admin) } @@ -71,7 +71,7 @@ describe "Internal Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/compare" do + describe "GET /:project_path/-/compare" do subject { project_compare_index_path(project) } it { is_expected.to be_allowed_for(:admin) } @@ -127,7 +127,7 @@ describe "Internal Project Access" do it { is_expected.to be_denied_for(:external) } end - describe "GET /:project_path/blob" do + describe "GET /:project_path/-/blob" do let(:commit) { project.repository.commit } subject { project_blob_path(project, File.join(commit.id, '.gitignore')) } @@ -229,7 +229,7 @@ describe "Internal Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/merge_requests" do + describe "GET /:project_path/-/merge_requests" do subject { project_merge_requests_path(project) } it { is_expected.to be_allowed_for(:admin) } @@ -243,7 +243,7 @@ describe "Internal Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/merge_requests/new" do + describe "GET /:project_path/-/merge_requests/new" do subject { project_new_merge_request_path(project) } it { is_expected.to be_allowed_for(:admin) } @@ -257,7 +257,7 @@ describe "Internal Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/branches" do + describe "GET /:project_path/-/branches" do subject { project_branches_path(project) } before do @@ -278,7 +278,7 @@ describe "Internal Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/tags" do + describe "GET /:project_path/-/tags" do subject { project_tags_path(project) } before do diff --git a/spec/features/security/project/private_access_spec.rb b/spec/features/security/project/private_access_spec.rb index 2404b7cc69d..97e6b3bd4ff 100644 --- a/spec/features/security/project/private_access_spec.rb +++ b/spec/features/security/project/private_access_spec.rb @@ -29,7 +29,7 @@ describe "Private Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/tree/master" do + describe "GET /:project_path/-/tree/master" do subject { project_tree_path(project, project.repository.root_ref) } it { is_expected.to be_allowed_for(:admin) } @@ -43,7 +43,7 @@ describe "Private Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/commits/master" do + describe "GET /:project_path/-/commits/master" do subject { project_commits_path(project, project.repository.root_ref, limit: 1) } it { is_expected.to be_allowed_for(:admin) } @@ -57,7 +57,7 @@ describe "Private Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/commit/:sha" do + describe "GET /:project_path/-/commit/:sha" do subject { project_commit_path(project, project.repository.commit) } it { is_expected.to be_allowed_for(:admin) } @@ -71,7 +71,7 @@ describe "Private Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/compare" do + describe "GET /:project_path/-/compare" do subject { project_compare_index_path(project) } it { is_expected.to be_allowed_for(:admin) } @@ -127,7 +127,7 @@ describe "Private Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/blob" do + describe "GET /:project_path/-/blob" do let(:commit) { project.repository.commit } subject { project_blob_path(project, File.join(commit.id, '.gitignore')) } @@ -215,7 +215,7 @@ describe "Private Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/merge_requests" do + describe "GET /:project_path/-/merge_requests" do subject { project_merge_requests_path(project) } it { is_expected.to be_allowed_for(:admin) } @@ -229,7 +229,7 @@ describe "Private Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/branches" do + describe "GET /:project_path/-/branches" do subject { project_branches_path(project) } before do @@ -250,7 +250,7 @@ describe "Private Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/tags" do + describe "GET /:project_path/-/tags" do subject { project_tags_path(project) } before do diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb index 8e07af61c8b..24bbb8d9b9e 100644 --- a/spec/features/security/project/public_access_spec.rb +++ b/spec/features/security/project/public_access_spec.rb @@ -29,7 +29,7 @@ describe "Public Project Access" do it { is_expected.to be_allowed_for(:visitor) } end - describe "GET /:project_path/tree/master" do + describe "GET /:project_path/-/tree/master" do subject { project_tree_path(project, project.repository.root_ref) } it { is_expected.to be_allowed_for(:admin) } @@ -43,7 +43,7 @@ describe "Public Project Access" do it { is_expected.to be_allowed_for(:visitor) } end - describe "GET /:project_path/commits/master" do + describe "GET /:project_path/-/commits/master" do subject { project_commits_path(project, project.repository.root_ref, limit: 1) } it { is_expected.to be_allowed_for(:admin) } @@ -57,7 +57,7 @@ describe "Public Project Access" do it { is_expected.to be_allowed_for(:visitor) } end - describe "GET /:project_path/commit/:sha" do + describe "GET /:project_path/-/commit/:sha" do subject { project_commit_path(project, project.repository.commit) } it { is_expected.to be_allowed_for(:admin) } @@ -71,7 +71,7 @@ describe "Public Project Access" do it { is_expected.to be_allowed_for(:visitor) } end - describe "GET /:project_path/compare" do + describe "GET /:project_path/-/compare" do subject { project_compare_index_path(project) } it { is_expected.to be_allowed_for(:admin) } @@ -345,7 +345,7 @@ describe "Public Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/blob" do + describe "GET /:project_path/-/blob" do let(:commit) { project.repository.commit } subject { project_blob_path(project, File.join(commit.id, '.gitignore')) } @@ -446,7 +446,7 @@ describe "Public Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/merge_requests" do + describe "GET /:project_path/-/merge_requests" do subject { project_merge_requests_path(project) } it { is_expected.to be_allowed_for(:admin) } @@ -460,7 +460,7 @@ describe "Public Project Access" do it { is_expected.to be_allowed_for(:visitor) } end - describe "GET /:project_path/merge_requests/new" do + describe "GET /:project_path/-/merge_requests/new" do subject { project_new_merge_request_path(project) } it { is_expected.to be_allowed_for(:admin) } @@ -474,7 +474,7 @@ describe "Public Project Access" do it { is_expected.to be_denied_for(:visitor) } end - describe "GET /:project_path/branches" do + describe "GET /:project_path/-/branches" do subject { project_branches_path(project) } before do @@ -495,7 +495,7 @@ describe "Public Project Access" do it { is_expected.to be_allowed_for(:visitor) } end - describe "GET /:project_path/tags" do + describe "GET /:project_path/-/tags" do subject { project_tags_path(project) } before do |