summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorRoger Rüttimann <ror@panter.ch>2019-02-07 15:20:58 +0100
committerRoger Meier <r.meier@siemens.com>2019-06-13 08:43:14 +0200
commit28782d5165fee8251321fce65e54c4722a4db581 (patch)
treed97207a33921788e07949e5533cc19b4f6bc15b4 /spec/models
parentdfe5ffd4edd34adc9dbb941f22a8843ee4f12e6d (diff)
downloadgitlab-ce-28782d5165fee8251321fce65e54c4722a4db581.tar.gz
remove experiments for 2fa requirements and fix tests
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/group_spec.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 15ec672f165..7f0b1185ba4 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -633,7 +633,11 @@ describe Group do
group.update!(require_two_factor_authentication: true, two_factor_grace_period: 23)
- expect(calls).to eq 2
+ if Group.supports_nested_objects?
+ expect(calls).to eq 2
+ else
+ expect(calls).to eq 1
+ end
end
it 'calls #update_two_factor_requirement on each group member' do