diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-19 18:08:48 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-19 18:08:48 +0000 |
commit | bb915e6375fe65053937c6bf8a7d0771dc9e4713 (patch) | |
tree | 1836cb9ec3d39d283707997f86f2edfc77c4e121 /spec/graphql | |
parent | b6d63c915a91aeb7a4437349c53e68be8c50cf4e (diff) | |
download | gitlab-ce-bb915e6375fe65053937c6bf8a7d0771dc9e4713.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/graphql')
-rw-r--r-- | spec/graphql/resolvers/ci/runner_projects_resolver_spec.rb | 26 | ||||
-rw-r--r-- | spec/graphql/types/merge_request_type_spec.rb | 4 |
2 files changed, 26 insertions, 4 deletions
diff --git a/spec/graphql/resolvers/ci/runner_projects_resolver_spec.rb b/spec/graphql/resolvers/ci/runner_projects_resolver_spec.rb index 6c69cdc19cc..44203fb2912 100644 --- a/spec/graphql/resolvers/ci/runner_projects_resolver_spec.rb +++ b/spec/graphql/resolvers/ci/runner_projects_resolver_spec.rb @@ -27,6 +27,28 @@ RSpec.describe Resolvers::Ci::RunnerProjectsResolver, feature_category: :runner_ end end + context 'with sort argument' do + let(:args) { { sort: sort } } + + context 'when :id_asc' do + let(:sort) { :id_asc } + + it 'returns a lazy value with projects sorted by :id_asc' do + expect(subject).to be_a(GraphQL::Execution::Lazy) + expect(subject.value.items).to eq([project1, project2, project3]) + end + end + + context 'when :id_desc' do + let(:sort) { :id_desc } + + it 'returns a lazy value with projects sorted by :id_desc' do + expect(subject).to be_a(GraphQL::Execution::Lazy) + expect(subject.value.items).to eq([project3, project2, project1]) + end + end + end + context 'with supported arguments' do let(:args) { { membership: true, search_namespaces: true, topics: %w[xyz] } } @@ -47,9 +69,9 @@ RSpec.describe Resolvers::Ci::RunnerProjectsResolver, feature_category: :runner_ end context 'without arguments' do - it 'returns a lazy value with all projects' do + it 'returns a lazy value with all projects sorted by :id_asc' do expect(subject).to be_a(GraphQL::Execution::Lazy) - expect(subject.value).to contain_exactly(project1, project2, project3) + expect(subject.value.items).to eq([project1, project2, project3]) end end end diff --git a/spec/graphql/types/merge_request_type_spec.rb b/spec/graphql/types/merge_request_type_spec.rb index 8a4c89fc340..4d4c4d3cade 100644 --- a/spec/graphql/types/merge_request_type_spec.rb +++ b/spec/graphql/types/merge_request_type_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GitlabSchema.types['MergeRequest'] do +RSpec.describe GitlabSchema.types['MergeRequest'], feature_category: :code_review_workflow do include GraphqlHelpers specify { expect(described_class).to expose_permissions_using(Types::PermissionTypes::MergeRequest) } @@ -36,7 +36,7 @@ RSpec.describe GitlabSchema.types['MergeRequest'] do commit_count current_user_todos conflicts auto_merge_enabled approved_by source_branch_protected squash_on_merge available_auto_merge_strategies has_ci mergeable commits committers commits_without_merge_commits squash security_auto_fix default_squash_commit_message - auto_merge_strategy merge_user + auto_merge_strategy merge_user award_emoji ] expect(described_class).to have_graphql_fields(*expected_fields).at_least |