diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /spec/lib/feature/gitaly_spec.rb | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/lib/feature/gitaly_spec.rb')
-rw-r--r-- | spec/lib/feature/gitaly_spec.rb | 67 |
1 files changed, 55 insertions, 12 deletions
diff --git a/spec/lib/feature/gitaly_spec.rb b/spec/lib/feature/gitaly_spec.rb index a2181a63335..696427bb8b6 100644 --- a/spec/lib/feature/gitaly_spec.rb +++ b/spec/lib/feature/gitaly_spec.rb @@ -3,35 +3,78 @@ require 'spec_helper' RSpec.describe Feature::Gitaly do - let(:feature_flag) { "mep_mep" } + let_it_be(:project) { create(:project) } + let_it_be(:project_2) { create(:project) } + + before do + skip_feature_flags_yaml_validation + end describe ".enabled?" do - context 'when the gate is closed' do - before do - stub_feature_flags(gitaly_mep_mep: false) + context 'when the flag is set globally' do + let(:feature_flag) { 'global_flag' } + + context 'when the gate is closed' do + before do + stub_feature_flags(gitaly_global_flag: false) + end + + it 'returns false' do + expect(described_class.enabled?(feature_flag)).to be(false) + end end - it 'returns false' do - expect(described_class.enabled?(feature_flag)).to be(false) + context 'when the flag defaults to on' do + it 'returns true' do + expect(described_class.enabled?(feature_flag)).to be(true) + end end end - context 'when the flag defaults to on' do - it 'returns true' do - expect(described_class.enabled?(feature_flag)).to be(true) + context 'when the flag is enabled for a particular project' do + let(:feature_flag) { 'project_flag' } + + before do + stub_feature_flags(gitaly_project_flag: project) + end + + it 'returns true for that project' do + expect(described_class.enabled?(feature_flag, project)).to be(true) + end + + it 'returns false for any other project' do + expect(described_class.enabled?(feature_flag, project_2)).to be(false) + end + + it 'returns false when no project is passed' do + expect(described_class.enabled?(feature_flag)).to be(false) end end end describe ".server_feature_flags" do before do - stub_feature_flags(gitaly_mep_mep: true, foo: true) + stub_feature_flags(gitaly_global_flag: true, gitaly_project_flag: project, non_gitaly_flag: false) end subject { described_class.server_feature_flags } - it { is_expected.to be_a(Hash) } - it { is_expected.to eq("gitaly-feature-mep-mep" => "true") } + it 'returns a hash of flags starting with the prefix, with dashes instead of underscores' do + expect(subject).to eq('gitaly-feature-global-flag' => 'true', + 'gitaly-feature-project-flag' => 'false') + end + + context 'when a project is passed' do + it 'returns the value for the flag on the given project' do + expect(described_class.server_feature_flags(project)) + .to eq('gitaly-feature-global-flag' => 'true', + 'gitaly-feature-project-flag' => 'true') + + expect(described_class.server_feature_flags(project_2)) + .to eq('gitaly-feature-global-flag' => 'true', + 'gitaly-feature-project-flag' => 'false') + end + end context 'when table does not exist' do before do |