summaryrefslogtreecommitdiff
path: root/spec/frontend/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-14 03:06:25 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-14 03:06:25 +0000
commit29c01c6c91558358c37ba45b03f240632bfb918d (patch)
treec6475afaf98ce740e8ba5fe227e7bd4a95b692cd /spec/frontend/fixtures
parenteed996ac33a60d5fd8315a62fec8beaa8e907e69 (diff)
downloadgitlab-ce-29c01c6c91558358c37ba45b03f240632bfb918d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/fixtures')
-rw-r--r--spec/frontend/fixtures/u2f.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/frontend/fixtures/u2f.rb b/spec/frontend/fixtures/u2f.rb
index dded6ce6380..9710fbbc181 100644
--- a/spec/frontend/fixtures/u2f.rb
+++ b/spec/frontend/fixtures/u2f.rb
@@ -34,7 +34,9 @@ context 'U2F' do
before do
sign_in(user)
- allow_any_instance_of(Profiles::TwoFactorAuthsController).to receive(:build_qr_code).and_return('qrcode:blackandwhitesquares')
+ allow_next_instance_of(Profiles::TwoFactorAuthsController) do |instance|
+ allow(instance).to receive(:build_qr_code).and_return('qrcode:blackandwhitesquares')
+ end
end
it 'u2f/register.html' do