Merge branch 'master' into bootstrap4

2 files changed, 8 insertions, 6 deletions

diff --git a/qa/qa/specs/features/merge_request/create_spec.rb b/qa/qa/specs/features/merge_request/create_spec.rb
index fbf9a4d17e5..0931e649e24 100644
--- a/qa/qa/specs/features/merge_request/create_spec.rb
+++ b/qa/qa/specs/features/merge_request/create_spec.rb
@@ -11,7 +11,7 @@ module QA
 
       expect(page).to have_content('This is a merge request')
       expect(page).to have_content('Great feature')
-      expect(page).to have_content('Opened less than a minute ago')
+      expect(page).to have_content(/Opened [\w\s]+ a minute ago/)
     end
   end
 end
diff --git a/qa/qa/specs/features/project/deploy_key_clone_spec.rb b/qa/qa/specs/features/project/deploy_key_clone_spec.rb
index bf8fa230244..442ac312b4d 100644
--- a/qa/qa/specs/features/project/deploy_key_clone_spec.rb
+++ b/qa/qa/specs/features/project/deploy_key_clone_spec.rb
@@ -33,13 +33,15 @@ module QA
     end
 
     keys = [
-      Runtime::Key::RSA.new(8192),
-      Runtime::Key::ECDSA.new(521),
-      Runtime::Key::ED25519.new
+      [Runtime::Key::RSA, 8192],
+      [Runtime::Key::ECDSA, 521],
+      [Runtime::Key::ED25519]
     ]
 
-    keys.each do |key|
-      scenario "user sets up a deploy key with #{key.name}(#{key.bits}) to clone code using pipelines" do
+    keys.each do |(key_class, bits)|
+      scenario "user sets up a deploy key with #{key_class}(#{bits}) to clone code using pipelines" do
+        key = key_class.new(*bits)
+
         login
 
         Factory::Resource::DeployKey.fabricate! do |resource|