Merge branch 'qa-shl-fix-file-locking-spec' into 'master'

Fix file locking e2e tests

See merge request gitlab-org/gitlab!56307

qa/qa/ee/page/file/show.rb

@@ -24,22 +24,26 @@ module QA
           end
 
           def lock
-            click_element :lock_button
+            accept_confirm do
+              click_element :lock_button
+            end
 
             begin
               has_element? :lock_button, text: 'Unlock'
             rescue
-              raise ElementNotFound, %q(Button did not show expected state)
+              raise QA::Page::Base::ElementNotFound, %q(Button did not show expected state)
             end
           end
 
           def unlock
-            click_element :lock_button
+            accept_confirm do
+              click_element :lock_button
+            end
 
             begin
               has_element? :lock_button, text: 'Lock'
             rescue
-              raise ElementNotFound, %q(Button did not show expected state)
+              raise QA::Page::Base::ElementNotFound, %q(Button did not show expected state)
             end
           end