Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 5 deletions

diff --git a/qa/qa/support/matchers/eventually_matcher.rb b/qa/qa/support/matchers/eventually_matcher.rb
index d380dfeb5bf..ff8adab424b 100644
--- a/qa/qa/support/matchers/eventually_matcher.rb
+++ b/qa/qa/support/matchers/eventually_matcher.rb
@@ -108,10 +108,7 @@ module QA
             #
             # @return [String]
             def operator_msg
-              case operator
-              when 'eq' then 'equal'
-              else operator
-              end
+              operator == 'eq' ? 'equal' : operator
             end
 
             # Expect operator
@@ -127,7 +124,7 @@ module QA
             def expectation_args
               if operator.include?('truthy') || operator.include?('falsey') || operator.include?('empty')
                 operator
-              elsif operator == "include" && expected.is_a?(Array)
+              elsif operator == 'include' && expected.is_a?(Array)
                 [operator, *expected]
               else
                 [operator, expected]