diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-06 06:12:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-06 06:12:13 +0300 |
commit | ae4e6f370a477782f19008717449047b2d0fb254 (patch) | |
tree | a3dda41879e8a5c070592b52fc0a7250ec9b307b /spec | |
parent | 9cc2aa99c032c8b813ab1bfc439a56d39d83e679 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
8 files changed, 278 insertions, 49 deletions
diff --git a/spec/finders/projects_finder_spec.rb b/spec/finders/projects_finder_spec.rb index b8ba1176ea2..f7afd96fa09 100644 --- a/spec/finders/projects_finder_spec.rb +++ b/spec/finders/projects_finder_spec.rb @@ -425,13 +425,30 @@ RSpec.describe ProjectsFinder, feature_category: :groups_and_projects do it { is_expected.to match_array([internal_project]) } end - describe 'always filters by without_deleted' do + describe 'filters by without_deleted by default' do let_it_be(:pending_delete_project) { create(:project, :public, pending_delete: true) } it 'returns projects that are not pending_delete' do expect(subject).not_to include(pending_delete_project) expect(subject).to include(public_project, internal_project) end + + context 'when include_pending_delete param is provided' do + let(:params) { { include_pending_delete: true } } + + it 'returns projects that are not pending_delete' do + expect(subject).not_to include(pending_delete_project) + expect(subject).to include(public_project, internal_project) + end + + context 'when user is an admin', :enable_admin_mode do + let(:current_user) { create(:admin) } + + it 'also return pending_delete projects' do + expect(subject).to include(public_project, internal_project, pending_delete_project) + end + end + end end describe 'filter by last_activity_before' do diff --git a/spec/requests/api/ml/mlflow/model_versions_spec.rb b/spec/requests/api/ml/mlflow/model_versions_spec.rb new file mode 100644 index 00000000000..f59888ec70f --- /dev/null +++ b/spec/requests/api/ml/mlflow/model_versions_spec.rb @@ -0,0 +1,86 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe API::Ml::Mlflow::ModelVersions, feature_category: :mlops do + let_it_be(:project) { create(:project) } + let_it_be(:developer) { create(:user).tap { |u| project.add_developer(u) } } + let_it_be(:another_project) { build(:project).tap { |p| p.add_developer(developer) } } + + let_it_be(:name) { 'a-model-name' } + let_it_be(:version) { '0.0.1' } + let_it_be(:model) { create(:ml_models, project: project, name: name) } + let_it_be(:model_version) { create(:ml_model_versions, project: project, model: model, version: version) } + + let_it_be(:tokens) do + { + write: create(:personal_access_token, scopes: %w[read_api api], user: developer), + read: create(:personal_access_token, scopes: %w[read_api], user: developer), + no_access: create(:personal_access_token, scopes: %w[read_user], user: developer), + different_user: create(:personal_access_token, scopes: %w[read_api api], user: build(:user)) + } + end + + let(:current_user) { developer } + let(:access_token) { tokens[:write] } + let(:headers) { { 'Authorization' => "Bearer #{access_token.token}" } } + let(:project_id) { project.id } + let(:default_params) { {} } + let(:params) { default_params } + let(:request) { get api(route), params: params, headers: headers } + let(:json_response) { Gitlab::Json.parse(api_response.body) } + + subject(:api_response) do + request + response + end + + describe 'GET /projects/:id/ml/mlflow/api/2.0/mlflow/model_versions/get' do + let(:route) do + "/projects/#{project_id}/ml/mlflow/api/2.0/mlflow/model_versions/get?name=#{name}&version=#{version}" + end + + it 'returns the model version', :aggregate_failures do + is_expected.to have_gitlab_http_status(:ok) + expect(json_response['model_version']).not_to be_nil + expect(json_response['model_version']['name']).to eq(name) + expect(json_response['model_version']['version']).to eq(version) + end + + describe 'Error States' do + context 'when has access' do + context 'and model name in incorrect' do + let(:route) do + "/projects/#{project_id}/ml/mlflow/api/2.0/mlflow/model_versions/get?name=--&version=#{version}" + end + + it_behaves_like 'MLflow|Not Found - Resource Does Not Exist' + end + + context 'and version in incorrect' do + let(:route) do + "/projects/#{project_id}/ml/mlflow/api/2.0/mlflow/model_versions/get?name=#{name}&version=--" + end + + it_behaves_like 'MLflow|Not Found - Resource Does Not Exist' + end + + context 'when user lacks read_model_registry rights' do + before do + allow(Ability).to receive(:allowed?).and_call_original + allow(Ability).to receive(:allowed?) + .with(current_user, :read_model_registry, project) + .and_return(false) + end + + it "is Not Found" do + is_expected.to have_gitlab_http_status(:not_found) + end + end + end + + it_behaves_like 'MLflow|shared model registry error cases' + it_behaves_like 'MLflow|Requires read_api scope' + end + end +end diff --git a/spec/requests/api/project_repository_storage_moves_spec.rb b/spec/requests/api/project_repository_storage_moves_spec.rb index 96ed3042d00..7b5dc0d5ef8 100644 --- a/spec/requests/api/project_repository_storage_moves_spec.rb +++ b/spec/requests/api/project_repository_storage_moves_spec.rb @@ -8,5 +8,29 @@ RSpec.describe API::ProjectRepositoryStorageMoves, feature_category: :gitaly do let_it_be(:storage_move) { create(:project_repository_storage_move, :scheduled, container: container) } let(:repository_storage_move_factory) { :project_repository_storage_move } let(:bulk_worker_klass) { Projects::ScheduleBulkRepositoryShardMovesWorker } + + context 'when project is hidden' do + let_it_be(:container) { create(:project, :hidden) } + let_it_be(:storage_move) { create(:project_repository_storage_move, :scheduled, container: container) } + + it_behaves_like 'get single container repository storage move' do + let(:container_id) { container.id } + let(:url) { "/projects/#{container_id}/repository_storage_moves/#{repository_storage_move_id}" } + end + + it_behaves_like 'post single container repository storage move' + end + + context 'when project is pending delete' do + let_it_be(:container) { create(:project, pending_delete: true) } + let_it_be(:storage_move) { create(:project_repository_storage_move, :scheduled, container: container) } + + it_behaves_like 'get single container repository storage move' do + let(:container_id) { container.id } + let(:url) { "/projects/#{container_id}/repository_storage_moves/#{repository_storage_move_id}" } + end + + it_behaves_like 'post single container repository storage move' + end end end diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index ce90b9f1474..94ed527d9d8 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -286,6 +286,32 @@ RSpec.describe API::Projects, :aggregate_failures, feature_category: :groups_and expect(json_response.map { |p| p['id'] }).not_to include(project.id) end + context 'when user requests pending_delete projects' do + before do + project.update!(pending_delete: true) + end + + let(:params) { { include_pending_delete: true } } + + it 'does not return projects marked for deletion' do + get api(path, user), params: params + + expect(response).to have_gitlab_http_status(:ok) + expect(json_response).to be_an Array + expect(json_response.map { |p| p['id'] }).not_to include(project.id) + end + + context 'when user is an admin' do + it 'returns projects marked for deletion' do + get api(path, admin, admin_mode: true), params: params + + expect(response).to have_gitlab_http_status(:ok) + expect(json_response).to be_an Array + expect(json_response.map { |p| p['id'] }).to include(project.id) + end + end + end + it 'does not include open_issues_count if issues are disabled' do project.project_feature.update_attribute(:issues_access_level, ProjectFeature::DISABLED) diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index 1abb02cd9f0..ce8e7ae1b6f 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -227,6 +227,19 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_profile end end + context 'with search parameter' do + let_it_be(:first_user) { create(:user, username: 'a-user') } + let_it_be(:second_user) { create(:user, username: 'a-user2') } + + it 'prioritizes username match' do + get api(path, user, admin_mode: true), params: { search: first_user.username } + + expect(response).to have_gitlab_http_status(:ok) + expect(json_response.first['username']).to eq('a-user') + expect(json_response.second['username']).to eq('a-user2') + end + end + context 'N+1 queries' do before do create_list(:user, 2) diff --git a/spec/services/ml/model_versions/get_model_version_service_spec.rb b/spec/services/ml/model_versions/get_model_version_service_spec.rb new file mode 100644 index 00000000000..b46a0bf6d1d --- /dev/null +++ b/spec/services/ml/model_versions/get_model_version_service_spec.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Ml::ModelVersions::GetModelVersionService, feature_category: :mlops do + let_it_be(:existing_version) { create(:ml_model_versions) } + let_it_be(:another_project) { create(:project) } + + subject(:model_version) { described_class.new(project, name, version).execute } + + describe '#execute' do + context 'when model version exists' do + let(:name) { existing_version.name } + let(:version) { existing_version.version } + let(:project) { existing_version.project } + + it { is_expected.to eq(existing_version) } + end + + context 'when model version does not exist' do + let(:project) { existing_version.project } + let(:name) { 'a_new_model' } + let(:version) { '2.0.0' } + + it { is_expected.to be_nil } + end + end +end diff --git a/spec/support/shared_examples/requests/api/ml/mlflow/mlflow_shared_examples.rb b/spec/support/shared_examples/requests/api/ml/mlflow/mlflow_shared_examples.rb index 00e50b07909..7978f43610d 100644 --- a/spec/support/shared_examples/requests/api/ml/mlflow/mlflow_shared_examples.rb +++ b/spec/support/shared_examples/requests/api/ml/mlflow/mlflow_shared_examples.rb @@ -74,6 +74,37 @@ RSpec.shared_examples 'MLflow|shared error cases' do end end +RSpec.shared_examples 'MLflow|shared model registry error cases' do + context 'when not authenticated' do + let(:headers) { {} } + + it "is Unauthorized" do + is_expected.to have_gitlab_http_status(:unauthorized) + end + end + + context 'when user does not have access' do + let(:access_token) { tokens[:different_user] } + + it "is Not Found" do + is_expected.to have_gitlab_http_status(:not_found) + end + end + + context 'when model registry is unavailable' do + before do + allow(Ability).to receive(:allowed?).and_call_original + allow(Ability).to receive(:allowed?) + .with(current_user, :read_model_registry, project) + .and_return(false) + end + + it "is Not Found" do + is_expected.to have_gitlab_http_status(:not_found) + end + end +end + RSpec.shared_examples 'MLflow|Bad Request on missing required' do |keys| keys.each do |key| context "when \"#{key}\" is missing" do diff --git a/spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb b/spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb index 3913d29e086..181bab41e09 100644 --- a/spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb +++ b/spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb @@ -80,56 +80,9 @@ RSpec.shared_examples 'repository_storage_moves API' do |container_type| end end - describe "GET /#{container_type}/:id/repository_storage_moves" do - let(:container_id) { container.id } + shared_examples 'post single container repository storage move' do let(:url) { "/#{container_type}/#{container_id}/repository_storage_moves" } - - it_behaves_like 'get container repository storage move list' - - context 'non-existent container' do - let(:container_id) { non_existing_record_id } - - it 'returns not found' do - get api(url, user, admin_mode: user.admin?) - - expect(response).to have_gitlab_http_status(:not_found) - end - end - end - - describe "GET /#{container_type}/:id/repository_storage_moves/:repository_storage_move_id" do let(:container_id) { container.id } - let(:url) { "/#{container_type}/#{container_id}/repository_storage_moves/#{repository_storage_move_id}" } - - it_behaves_like 'get single container repository storage move' - - context 'non-existent container' do - let(:container_id) { non_existing_record_id } - let(:repository_storage_move_id) { storage_move.id } - - it 'returns not found' do - get api(url, user, admin_mode: user.admin?) - - expect(response).to have_gitlab_http_status(:not_found) - end - end - end - - describe "GET /#{container_type.singularize}_repository_storage_moves" do - it_behaves_like 'get container repository storage move list' do - let(:url) { "/#{container_type.singularize}_repository_storage_moves" } - end - end - - describe "GET /#{container_type.singularize}_repository_storage_moves/:repository_storage_move_id" do - it_behaves_like 'get single container repository storage move' do - let(:url) { "/#{container_type.singularize}_repository_storage_moves/#{repository_storage_move_id}" } - end - end - - describe "POST /#{container_type}/:id/repository_storage_moves", :aggregate_failures do - let(:container_id) { container.id } - let(:url) { "/#{container_type}/#{container_id}/repository_storage_moves" } let(:destination_storage_name) { 'test_second_storage' } def create_container_repository_storage_move @@ -186,6 +139,57 @@ RSpec.shared_examples 'repository_storage_moves API' do |container_type| end end + describe "GET /#{container_type}/:id/repository_storage_moves" do + let(:container_id) { container.id } + let(:url) { "/#{container_type}/#{container_id}/repository_storage_moves" } + + it_behaves_like 'get container repository storage move list' + + context 'non-existent container' do + let(:container_id) { non_existing_record_id } + + it 'returns not found' do + get api(url, user, admin_mode: user.admin?) + + expect(response).to have_gitlab_http_status(:not_found) + end + end + end + + describe "GET /#{container_type}/:id/repository_storage_moves/:repository_storage_move_id" do + let(:container_id) { container.id } + let(:url) { "/#{container_type}/#{container_id}/repository_storage_moves/#{repository_storage_move_id}" } + + it_behaves_like 'get single container repository storage move' + + context 'non-existent container' do + let(:container_id) { non_existing_record_id } + let(:repository_storage_move_id) { storage_move.id } + + it 'returns not found' do + get api(url, user, admin_mode: user.admin?) + + expect(response).to have_gitlab_http_status(:not_found) + end + end + end + + describe "GET /#{container_type.singularize}_repository_storage_moves" do + it_behaves_like 'get container repository storage move list' do + let(:url) { "/#{container_type.singularize}_repository_storage_moves" } + end + end + + describe "GET /#{container_type.singularize}_repository_storage_moves/:repository_storage_move_id" do + it_behaves_like 'get single container repository storage move' do + let(:url) { "/#{container_type.singularize}_repository_storage_moves/#{repository_storage_move_id}" } + end + end + + describe "POST /#{container_type}/:id/repository_storage_moves", :aggregate_failures do + it_behaves_like 'post single container repository storage move' + end + describe "POST /#{container_type.singularize}_repository_storage_moves" do let(:url) { "/#{container_type.singularize}_repository_storage_moves" } let(:source_storage_name) { 'default' } |