6 files changed, 32 insertions, 16 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 4bdef49499c..a16e8821cb5 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
@@ -29,8 +29,10 @@ RSpec.describe Resolvers::DesignManagement::DesignAtVersionResolver do
     context 'when the user cannot see designs' do
       let(:current_user) { create(:user) }
 
-      it 'raises ResourceNotAvailable' do
-        expect { resolve_design }.to raise_error(resource_not_available)
+      it 'generates ResourceNotAvailable' do
+        expect_graphql_error_to_be_created(resource_not_available) do
+          resolve_design
+        end
       end
     end
 
@@ -45,8 +47,10 @@ RSpec.describe Resolvers::DesignManagement::DesignAtVersionResolver do
 
       let(:global_id) { global_id_of(other_dav) }
 
-      it 'raises ResourceNotAvailable' do
-        expect { resolve_design }.to raise_error(resource_not_available)
+      it 'generates ResourceNotAvailable' do
+        expect_graphql_error_to_be_created(resource_not_available) do
+          resolve_design
+        end
       end
 
       context 'the current object does not constrain the issue' do
diff --git a/spec/graphql/resolvers/design_management/design_resolver_spec.rb b/spec/graphql/resolvers/design_management/design_resolver_spec.rb
index e33eaedf167..4c8b3116875 100644
--- a/spec/graphql/resolvers/design_management/design_resolver_spec.rb
+++ b/spec/graphql/resolvers/design_management/design_resolver_spec.rb
@@ -42,16 +42,20 @@ RSpec.describe Resolvers::DesignManagement::DesignResolver do
     context 'when no argument has been passed' do
       let(:args) { {} }
 
-      it 'raises an error' do
-        expect { resolve_design }.to raise_error(::Gitlab::Graphql::Errors::ArgumentError, /must/)
+      it 'generates an error' do
+        expect_graphql_error_to_be_created(::Gitlab::Graphql::Errors::ArgumentError, /must/) do
+          resolve_design
+        end
       end
     end
 
     context 'when both arguments have been passed' do
       let(:args) { { filename: first_design.filename, id: GitlabSchema.id_from_object(first_design).to_s } }
 
-      it 'raises an error' do
-        expect { resolve_design }.to raise_error(::Gitlab::Graphql::Errors::ArgumentError, /may/)
+      it 'generates an error' do
+        expect_graphql_error_to_be_created(::Gitlab::Graphql::Errors::ArgumentError, /may/) do
+          resolve_design
+        end
       end
     end
 
diff --git a/spec/graphql/resolvers/design_management/version/design_at_version_resolver_spec.rb b/spec/graphql/resolvers/design_management/version/design_at_version_resolver_spec.rb
index cc7e2f6814a..829227185c2 100644
--- a/spec/graphql/resolvers/design_management/version/design_at_version_resolver_spec.rb
+++ b/spec/graphql/resolvers/design_management/version/design_at_version_resolver_spec.rb
@@ -24,8 +24,10 @@ RSpec.describe Resolvers::DesignManagement::Version::DesignAtVersionResolver do
   shared_examples 'a bad argument' do
     let(:err_class) { ::Gitlab::Graphql::Errors::ArgumentError }
 
-    it 'raises an appropriate error' do
-      expect { resolve_objects }.to raise_error(err_class)
+    it 'generates an error' do
+      expect_graphql_error_to_be_created(err_class) do
+        resolve_objects
+      end
     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 b0fc78af2af..8b9874c3580 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
@@ -26,8 +26,10 @@ RSpec.describe Resolvers::DesignManagement::VersionInCollectionResolver do
     subject(:result) { resolve_version(issue.design_collection) }
 
     context 'Neither id nor sha is passed as parameters' do
-      it 'raises an appropriate error' do
-        expect { result }.to raise_error(appropriate_error)
+      it 'generates an appropriate error' do
+        expect_graphql_error_to_be_created(appropriate_error) do
+          result
+        end
       end
     end
 
diff --git a/spec/graphql/resolvers/design_management/version_resolver_spec.rb b/spec/graphql/resolvers/design_management/version_resolver_spec.rb
index af1e6a73d09..ab1d7d4d9c5 100644
--- a/spec/graphql/resolvers/design_management/version_resolver_spec.rb
+++ b/spec/graphql/resolvers/design_management/version_resolver_spec.rb
@@ -22,8 +22,10 @@ RSpec.describe Resolvers::DesignManagement::VersionResolver do
   context 'the current user is not authorized' do
     let(:current_user) { create(:user) }
 
-    it 'raises an error on resolution' do
-      expect { resolve_version }.to raise_error(::Gitlab::Graphql::Errors::ResourceNotAvailable)
+    it 'generates an error on resolution' do
+      expect_graphql_error_to_be_created(Gitlab::Graphql::Errors::ResourceNotAvailable) do
+        resolve_version
+      end
     end
   end
 
diff --git a/spec/graphql/resolvers/design_management/versions_resolver_spec.rb b/spec/graphql/resolvers/design_management/versions_resolver_spec.rb
index 2c9c3a47650..d98138f6385 100644
--- a/spec/graphql/resolvers/design_management/versions_resolver_spec.rb
+++ b/spec/graphql/resolvers/design_management/versions_resolver_spec.rb
@@ -98,8 +98,10 @@ RSpec.describe Resolvers::DesignManagement::VersionsResolver do
               }
             end
 
-            it 'raises a suitable error' do
-              expect { result }.to raise_error(GraphQL::ExecutionError)
+            it 'generates a suitable error' do
+              expect_graphql_error_to_be_created(Gitlab::Graphql::Errors::ResourceNotAvailable) do
+                result
+              end
             end
           end
         end