diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /spec/controllers/import | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'spec/controllers/import')
-rw-r--r-- | spec/controllers/import/available_namespaces_controller_spec.rb | 88 | ||||
-rw-r--r-- | spec/controllers/import/manifest_controller_spec.rb | 1 |
2 files changed, 78 insertions, 11 deletions
diff --git a/spec/controllers/import/available_namespaces_controller_spec.rb b/spec/controllers/import/available_namespaces_controller_spec.rb index ebccc862a13..0f98d649338 100644 --- a/spec/controllers/import/available_namespaces_controller_spec.rb +++ b/spec/controllers/import/available_namespaces_controller_spec.rb @@ -4,26 +4,94 @@ require 'spec_helper' RSpec.describe Import::AvailableNamespacesController do let_it_be(:user) { create(:user) } - let_it_be(:manageable_groups) { [create(:group), create(:group)] } before do sign_in(user) - manageable_groups.each { |group| group.add_maintainer(user) } end describe "GET index" do - it "returns list of available namespaces" do - unrelated_group = create(:group) + context "when having group with role never allowed to create projects" do + using RSpec::Parameterized::TableSyntax - get :index + where( + role: [:guest, :reporter], + default_project_creation_access: [::Gitlab::Access::MAINTAINER_PROJECT_ACCESS, ::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS], + group_project_creation_level: [nil, ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS, ::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS]) - expect(response).to have_gitlab_http_status(:ok) - expect(json_response).to be_kind_of(Array) + with_them do + before do + stub_application_setting(default_project_creation: default_project_creation_access) + end - response_ids = json_response.map { |n| n["id"] } + it "does not include group with access level #{params[:role]} in list" do + group = create(:group, project_creation_level: group_project_creation_level) + group.add_user(user, role) + get :index - expect(response_ids).not_to include(unrelated_group.id) - expect(response_ids).to contain_exactly(*manageable_groups.map(&:id)) + expect(response).to have_gitlab_http_status(:ok) + expect(json_response).not_to include({ + 'id' => group.id, + 'full_path' => group.full_path + }) + end + end + end + + context "when having group with role always allowed to create projects" do + using RSpec::Parameterized::TableSyntax + + where( + role: [:maintainer, :owner], + default_project_creation_access: [::Gitlab::Access::MAINTAINER_PROJECT_ACCESS, ::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS], + group_project_creation_level: [nil, ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS, ::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS]) + + with_them do + before do + stub_application_setting(default_project_creation: default_project_creation_access) + end + + it "does not include group with access level #{params[:role]} in list" do + group = create(:group, project_creation_level: group_project_creation_level) + group.add_user(user, role) + get :index + + expect(response).to have_gitlab_http_status(:ok) + expect(json_response).to include({ + 'id' => group.id, + 'full_path' => group.full_path + }) + end + end + end + + context "when having developer role" do + using RSpec::Parameterized::TableSyntax + + where(:default_project_creation_access, :project_creation_level, :is_visible) do + ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS | nil | false + ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS | ::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS | true + ::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS | nil | true + ::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS | ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS | false + end + + with_them do + before do + stub_application_setting(default_project_creation: default_project_creation_access) + end + + it "#{params[:is_visible] ? 'includes' : 'does not include'} group with access level #{params[:role]} in list" do + group = create(:group, project_creation_level: project_creation_level) + group.add_user(user, :developer) + + get :index + + expect(response).to have_gitlab_http_status(:ok) + expect(json_response).send(is_visible ? 'to' : 'not_to', include({ + 'id' => group.id, + 'full_path' => group.full_path + })) + end + end end context "with an anonymous user" do diff --git a/spec/controllers/import/manifest_controller_spec.rb b/spec/controllers/import/manifest_controller_spec.rb index 6b21b45e698..d5a498e80d9 100644 --- a/spec/controllers/import/manifest_controller_spec.rb +++ b/spec/controllers/import/manifest_controller_spec.rb @@ -74,7 +74,6 @@ RSpec.describe Import::ManifestController, :clean_gitlab_redis_shared_state do expect(json_response.dig("imported_projects", 0, "id")).to eq(project.id) expect(json_response.dig("provider_repos", 0, "id")).to eq(repo1[:id]) expect(json_response.dig("provider_repos", 1, "id")).to eq(repo2[:id]) - expect(json_response.dig("namespaces", 0, "id")).to eq(group.id) end it "does not show already added project" do |