summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-27 18:58:56 +0200
committerRémy Coutable <remy@rymai.me>2017-06-27 18:59:51 +0200
commit5fa9d6a17dac86e9976946ded7857e1392403136 (patch)
tree842b40fb6948b5ba444d9b526554393cede3ba2a /spec
parentb4d325c80c63ee9ee2676a57a42fac472b5b20d5 (diff)
downloadgitlab-ce-5fa9d6a17dac86e9976946ded7857e1392403136.tar.gz
Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually exclusive
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec')
-rw-r--r--spec/models/concerns/feature_gate_spec.rb19
-rw-r--r--spec/models/user_spec.rb14
2 files changed, 19 insertions, 14 deletions
diff --git a/spec/models/concerns/feature_gate_spec.rb b/spec/models/concerns/feature_gate_spec.rb
new file mode 100644
index 00000000000..3f601243245
--- /dev/null
+++ b/spec/models/concerns/feature_gate_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe FeatureGate do
+ describe 'User' do
+ describe '#flipper_id' do
+ context 'when user is not persisted' do
+ let(:user) { build(:user) }
+
+ it { expect(user.flipper_id).to be_nil }
+ end
+
+ context 'when user is persisted' do
+ let(:user) { create(:user) }
+
+ it { expect(user.flipper_id).to eq "User:#{user.id}" }
+ end
+ end
+ end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 05ba887c51f..8e895ec6634 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -430,20 +430,6 @@ describe User, models: true do
end
end
- describe '#flipper_id' do
- context 'when user is not persisted' do
- let(:user) { build(:user) }
-
- it { expect(user.flipper_id).to be_nil }
- end
-
- context 'when user is persisted' do
- let(:user) { create(:user) }
-
- it { expect(user.flipper_id).to eq "User:#{user.id}" }
- end
- end
-
describe '#generate_password' do
it "does not generate password by default" do
user = create(:user, password: 'abcdefghe')