Fix linting for new rubocop version.

Author: GUI

test/support/api_umbrella_test_helpers/capybara_codemirror.rb

@@ -9,7 +9,7 @@ def fill_in_codemirror(locator, options = {})
       label = find(:label, :for => field)
       label.click
 
-      fill_in(locator, **options.merge(:visible => :all))
+      fill_in(locator, **options, :visible => :all)
     end
 
     def assert_codemirror_field(locator, options = {})

test/support/api_umbrella_test_helpers/capybara_custom_bootstrap_inputs.rb

@@ -29,7 +29,7 @@ def _custom_check_with_label(selector, checked, locator, **options)
       options[:allow_self] = true if locator.nil?
       click_options = options.delete(:click) || { :x => 1, :y => 1 }
 
-      el = find(selector, locator, **options.merge(:visible => :all))
+      el = find(selector, locator, **options, :visible => :all)
       el.session.find(:label, :for => el, :visible => true).click(**click_options) unless el.checked? == checked
     ensure
       Capybara.w3c_click_offset = original_w3c_click_offset