Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 11 deletions

diff --git a/qa/Gemfile b/qa/Gemfile
index 6379f65db3d..e8d3a435766 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -11,7 +11,7 @@ gem 'capybara-screenshot', '~> 1.0.26'
 gem 'rake', '~> 13', '>= 13.0.6'
 gem 'rspec', '~> 3.12'
 # 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support.
-gem 'selenium-webdriver', '= 4.9.1'
+gem 'selenium-webdriver', '= 4.9.0'
 gem 'airborne', '~> 0.3.7', require: false # airborne is messing with rspec sandboxed mode so not requiring by default
 gem 'rest-client', '~> 2.1.0'
 gem 'rspec-retry', '~> 0.6.2', require: 'rspec/retry'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index b8f4880a436..9b2b8acfb87 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -269,7 +269,7 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    selenium-webdriver (4.9.1)
+    selenium-webdriver (4.9.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -345,7 +345,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rspec_junit_formatter (~> 0.6.0)
   ruby-debug-ide (~> 0.7.3)
-  selenium-webdriver (= 4.9.1)
+  selenium-webdriver (= 4.9.0)
   slack-notifier (~> 2.4)
   terminal-table (~> 3.0.2)
   warning (~> 1.3)
diff --git a/qa/qa/page/file/edit.rb b/qa/qa/page/file/edit.rb
index e66019279ce..ccf163cd1b4 100644
--- a/qa/qa/page/file/edit.rb
+++ b/qa/qa/page/file/edit.rb
@@ -8,10 +8,6 @@ module QA
         include Shared::CommitButton
         include Shared::Editor
 
-        view 'app/assets/javascripts/editor/extensions/source_editor_markdown_livepreview_ext.js' do
-          element :editor_toolbar_button, "qaSelector: 'editor_toolbar_button'" # rubocop:disable QA/ElementWithPattern
-        end
-
         def has_markdown_preview?(component, content)
           within_element(:source_editor_preview_container) do
             has_css?(component, exact_text: content)
@@ -23,10 +19,6 @@ module QA
 
           raise ElementNotFound, %("Couldn't find #{component} element with content '#{content}')
         end
-
-        def click_editor_toolbar
-          click_element(:editor_toolbar_button)
-        end
       end
     end
   end