Merge branch 'ml-fix-logging-qa' into 'master'

Don't log fabricate args

See merge request gitlab-org/gitlab-ce!22753

2 files changed, 4 insertions, 4 deletions

diff --git a/qa/qa/factory/base.rb b/qa/qa/factory/base.rb
index e28a00c545b..75438b77bf3 100644
--- a/qa/qa/factory/base.rb
+++ b/qa/qa/factory/base.rb
@@ -100,7 +100,7 @@ module QA
         msg = [prefix]
         msg << "Built a #{name}"
         msg << "as a dependency of #{parents.last}" if parents.any?
-        msg << "via #{method} with args #{args}"
+        msg << "via #{method}"
 
         yield.tap do
           msg << "in #{Time.now - start} seconds"
diff --git a/qa/spec/factory/base_spec.rb b/qa/spec/factory/base_spec.rb
index e9584a27d63..990eba76460 100644
--- a/qa/spec/factory/base_spec.rb
+++ b/qa/spec/factory/base_spec.rb
@@ -81,8 +81,8 @@ describe QA::Factory::Base do
       stub_env('QA_DEBUG', 'true')
       expect(factory).to receive(:fabricate_via_api!).and_return(location)
 
-      expect { subject.fabricate_via_api!(factory: factory, parents: []) }
-        .to output(/==> Built a MyFactory via api with args \[\] in [\d\w\.\-]+/)
+      expect { subject.fabricate_via_api!('something', factory: factory, parents: []) }
+        .to output(/==> Built a MyFactory via api in [\d\.\-e]+ seconds+/)
         .to_stdout
     end
   end
@@ -108,7 +108,7 @@ describe QA::Factory::Base do
       stub_env('QA_DEBUG', 'true')
 
       expect { subject.fabricate_via_browser_ui!('something', factory: factory, parents: []) }
-        .to output(/==> Built a MyFactory via browser_ui with args \["something"\] in [\d\w\.\-]+/)
+        .to output(/==> Built a MyFactory via browser_ui in [\d\.\-e]+ seconds+/)
         .to_stdout
     end
   end