diff options
Diffstat (limited to 'spec/graphql/resolvers/design_management')
5 files changed, 12 insertions, 27 deletions
diff --git a/spec/graphql/resolvers/design_management/design_at_version_resolver_spec.rb b/spec/graphql/resolvers/design_management/design_at_version_resolver_spec.rb index a16e8821cb5..3fe1ec4b5a4 100644 --- a/spec/graphql/resolvers/design_management/design_at_version_resolver_spec.rb +++ b/spec/graphql/resolvers/design_management/design_at_version_resolver_spec.rb @@ -14,7 +14,7 @@ RSpec.describe Resolvers::DesignManagement::DesignAtVersionResolver do let(:current_user) { user } let(:object) { issue.design_collection } - let(:global_id) { GitlabSchema.id_from_object(design_at_version).to_s } + let(:global_id) { GitlabSchema.id_from_object(design_at_version) } let(:design_at_version) { ::DesignManagement::DesignAtVersion.new(design: design_a, version: version_a) } diff --git a/spec/graphql/resolvers/design_management/design_resolver_spec.rb b/spec/graphql/resolvers/design_management/design_resolver_spec.rb index 4c8b3116875..0915dddf438 100644 --- a/spec/graphql/resolvers/design_management/design_resolver_spec.rb +++ b/spec/graphql/resolvers/design_management/design_resolver_spec.rb @@ -24,7 +24,7 @@ RSpec.describe Resolvers::DesignManagement::DesignResolver do create(:design, issue: create(:issue, project: project), versions: [create(:design_version)]) end - let(:args) { { id: GitlabSchema.id_from_object(first_design).to_s } } + let(:args) { { id: GitlabSchema.id_from_object(first_design) } } let(:gql_context) { { current_user: current_user } } before do @@ -50,7 +50,7 @@ RSpec.describe Resolvers::DesignManagement::DesignResolver do end context 'when both arguments have been passed' do - let(:args) { { filename: first_design.filename, id: GitlabSchema.id_from_object(first_design).to_s } } + let(:args) { { filename: first_design.filename, id: GitlabSchema.id_from_object(first_design) } } it 'generates an error' do expect_graphql_error_to_be_created(::Gitlab::Graphql::Errors::ArgumentError, /may/) do @@ -71,15 +71,6 @@ RSpec.describe Resolvers::DesignManagement::DesignResolver do expect(resolve_design).to be_nil end end - - context 'the ID does not belong to a design at all' do - let(:args) { { id: global_id_of(issue) } } - let(:msg) { /does not represent an instance of DesignManagement::Design/ } - - it 'complains meaningfully' do - expect { resolve_design }.to raise_error(msg) - end - end end context 'by filename' do diff --git a/spec/graphql/resolvers/design_management/designs_resolver_spec.rb b/spec/graphql/resolvers/design_management/designs_resolver_spec.rb index b091e58b06f..64eae14d888 100644 --- a/spec/graphql/resolvers/design_management/designs_resolver_spec.rb +++ b/spec/graphql/resolvers/design_management/designs_resolver_spec.rb @@ -109,6 +109,8 @@ RSpec.describe Resolvers::DesignManagement::DesignsResolver do end def resolve_designs - resolve(described_class, obj: issue.design_collection, args: args, ctx: gql_context) + Gitlab::Graphql::Lazy.force( + resolve(described_class, obj: issue.design_collection, args: args, ctx: gql_context) + ) end end diff --git a/spec/graphql/resolvers/design_management/version_in_collection_resolver_spec.rb b/spec/graphql/resolvers/design_management/version_in_collection_resolver_spec.rb index 8b9874c3580..00f37a8e5f6 100644 --- a/spec/graphql/resolvers/design_management/version_in_collection_resolver_spec.rb +++ b/spec/graphql/resolvers/design_management/version_in_collection_resolver_spec.rb @@ -50,15 +50,6 @@ RSpec.describe Resolvers::DesignManagement::VersionInCollectionResolver do it { is_expected.to be_nil } end - - context 'we pass the id of something that is not a design_version' do - let(:params) { { id: global_id_of(project) } } - let(:appropriate_error) { ::GraphQL::CoercionError } - - it 'raises an appropriate error' do - expect { result }.to raise_error(appropriate_error) - end - end end def resolve_version(obj, context = { current_user: current_user }) diff --git a/spec/graphql/resolvers/design_management/versions_resolver_spec.rb b/spec/graphql/resolvers/design_management/versions_resolver_spec.rb index d98138f6385..8eab0222cf6 100644 --- a/spec/graphql/resolvers/design_management/versions_resolver_spec.rb +++ b/spec/graphql/resolvers/design_management/versions_resolver_spec.rb @@ -18,8 +18,7 @@ RSpec.describe Resolvers::DesignManagement::VersionsResolver do let(:project) { issue.project } let(:params) { {} } let(:current_user) { authorized_user } - let(:parent_args) { { irrelevant: 1.2 } } - let(:parent) { double('Parent', parent: nil, irep_node: double(arguments: parent_args)) } + let(:query_context) { { current_user: current_user } } before do enable_design_management @@ -107,7 +106,9 @@ RSpec.describe Resolvers::DesignManagement::VersionsResolver do end context 'by at_version in parent' do - let(:parent_args) { { atVersion: global_id_of(first_version) } } + before do + query_context[:at_version_argument] = first_version.to_global_id + end it_behaves_like 'a query for all_versions up to the first_version' end @@ -126,8 +127,8 @@ RSpec.describe Resolvers::DesignManagement::VersionsResolver do it_behaves_like 'a source of versions' end - def resolve_versions(obj, context = { current_user: current_user }) - eager_resolve(resolver, obj: obj, parent: parent, args: params, ctx: context) + def resolve_versions(obj) + eager_resolve(resolver, obj: obj, args: params, ctx: query_context) end end end |