diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/graphql/resolvers/design_management/versions_resolver_spec.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/graphql/resolvers/design_management/versions_resolver_spec.rb')
-rw-r--r-- | spec/graphql/resolvers/design_management/versions_resolver_spec.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/spec/graphql/resolvers/design_management/versions_resolver_spec.rb b/spec/graphql/resolvers/design_management/versions_resolver_spec.rb index 5bc1c555e9a..23d4d86c79a 100644 --- a/spec/graphql/resolvers/design_management/versions_resolver_spec.rb +++ b/spec/graphql/resolvers/design_management/versions_resolver_spec.rb @@ -27,7 +27,7 @@ RSpec.describe Resolvers::DesignManagement::VersionsResolver do end shared_examples 'a source of versions' do - subject(:result) { resolve_versions(object) } + subject(:result) { resolve_versions(object)&.to_a } let_it_be(:all_versions) { object.versions.ordered } @@ -39,7 +39,7 @@ RSpec.describe Resolvers::DesignManagement::VersionsResolver do context 'without constraints' do it 'returns the ordered versions' do - expect(result).to eq(all_versions) + expect(result.to_a).to eq(all_versions) end end @@ -51,13 +51,13 @@ RSpec.describe Resolvers::DesignManagement::VersionsResolver do end context 'by earlier_or_equal_to_id' do - let(:params) { { id: global_id_of(first_version) } } + let(:params) { { earlier_or_equal_to_id: global_id_of(first_version) } } it_behaves_like 'a query for all_versions up to the first_version' end context 'by earlier_or_equal_to_sha' do - let(:params) { { sha: first_version.sha } } + let(:params) { { earlier_or_equal_to_sha: first_version.sha } } it_behaves_like 'a query for all_versions up to the first_version' end @@ -68,8 +68,8 @@ RSpec.describe Resolvers::DesignManagement::VersionsResolver do # return successfully let(:params) do { - sha: first_version.sha, - id: global_id_of(first_version) + earlier_or_equal_to_sha: first_version.sha, + earlier_or_equal_to_id: global_id_of(first_version) } end @@ -79,8 +79,8 @@ RSpec.describe Resolvers::DesignManagement::VersionsResolver do context 'and they do not match' do let(:params) do { - sha: first_version.sha, - id: global_id_of(other_version) + earlier_or_equal_to_sha: first_version.sha, + earlier_or_equal_to_id: global_id_of(other_version) } end @@ -111,7 +111,7 @@ RSpec.describe Resolvers::DesignManagement::VersionsResolver do end def resolve_versions(obj, context = { current_user: current_user }) - eager_resolve(resolver, obj: obj, args: params.merge(parent: parent), ctx: context) + eager_resolve(resolver, obj: obj, parent: parent, args: params, ctx: context) end end end |