Commit 2a89f065 authored by Sean McGivern's avatar Sean McGivern

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

Don't log fabricate args

See merge request gitlab-org/gitlab-ce!22753
parents 74b5dce4 e614af0b
...@@ -100,7 +100,7 @@ module QA ...@@ -100,7 +100,7 @@ module QA
msg = [prefix] msg = [prefix]
msg << "Built a #{name}" msg << "Built a #{name}"
msg << "as a dependency of #{parents.last}" if parents.any? msg << "as a dependency of #{parents.last}" if parents.any?
msg << "via #{method} with args #{args}" msg << "via #{method}"
yield.tap do yield.tap do
msg << "in #{Time.now - start} seconds" msg << "in #{Time.now - start} seconds"
......
...@@ -81,8 +81,8 @@ describe QA::Factory::Base do ...@@ -81,8 +81,8 @@ describe QA::Factory::Base do
stub_env('QA_DEBUG', 'true') stub_env('QA_DEBUG', 'true')
expect(factory).to receive(:fabricate_via_api!).and_return(location) expect(factory).to receive(:fabricate_via_api!).and_return(location)
expect { subject.fabricate_via_api!(factory: factory, parents: []) } expect { subject.fabricate_via_api!('something', factory: factory, parents: []) }
.to output(/==> Built a MyFactory via api with args \[\] in [\d\w\.\-]+/) .to output(/==> Built a MyFactory via api in [\d\.\-e]+ seconds+/)
.to_stdout .to_stdout
end end
end end
...@@ -108,7 +108,7 @@ describe QA::Factory::Base do ...@@ -108,7 +108,7 @@ describe QA::Factory::Base do
stub_env('QA_DEBUG', 'true') stub_env('QA_DEBUG', 'true')
expect { subject.fabricate_via_browser_ui!('something', factory: factory, parents: []) } 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 .to_stdout
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment