1 files changed, 35 insertions, 9 deletions

diff --git a/spec/support/shared_examples/graphql/mutations/issues/permission_check_shared_examples.rb b/spec/support/shared_examples/graphql/mutations/issues/permission_check_shared_examples.rb
index 34c58f524cd..05fee45427a 100644
--- a/spec/support/shared_examples/graphql/mutations/issues/permission_check_shared_examples.rb
+++ b/spec/support/shared_examples/graphql/mutations/issues/permission_check_shared_examples.rb
@@ -1,12 +1,34 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples 'permission level for issue mutation is correctly verified' do |raises_for_all_errors = false|
-  before do
-    issue.assignees = []
-    issue.author = user
+  let_it_be(:other_user_author) { create(:user) }
+
+  def issue_attributes(issue)
+    issue.attributes.except(
+      # Description and title can be updated by authors and assignees of the issues
+      'description',
+      'title',
+      # Those fields are calculated or expected to be modified during the mutations
+      'author_id',
+      'updated_at',
+      'updated_by_id',
+      'last_edited_at',
+      'last_edited_by_id',
+      'lock_version',
+      # There were spec failures due to nano-second comparisons
+      # this property isn't changed by any mutation so we don't have to verify it
+      'created_at'
+    )
   end
 
-  shared_examples_for 'when the user does not have access to the resource' do |raise_for_assigned|
+  let(:expected) { issue_attributes(issue) }
+
+  shared_examples_for 'when the user does not have access to the resource' do |raise_for_assigned_and_author|
+    before do
+      issue.assignees = []
+      issue.update!(author: other_user_author)
+    end
+
     it 'raises an error' do
       expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
     end
@@ -17,21 +39,25 @@ RSpec.shared_examples 'permission level for issue mutation is correctly verified
       end
 
       it 'does not modify issue' do
-        if raises_for_all_errors || raise_for_assigned
+        if raises_for_all_errors || raise_for_assigned_and_author
           expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
         else
-          expect(subject[:issue]).to eq issue
+          expect(issue_attributes(subject[:issue])).to eq expected
         end
       end
     end
 
     context 'even if author of the issue' do
       before do
-        issue.author = user
+        issue.update!(author: user)
       end
 
-      it 'raises an error' do
-        expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+      it 'does not modify issue' do
+        if raises_for_all_errors || raise_for_assigned_and_author
+          expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+        else
+          expect(issue_attributes(subject[:issue])).to eq expected
+        end
       end
     end
   end