Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

12 files changed, 210 insertions, 82 deletions

diff --git a/qa/spec/runtime/api/client_spec.rb b/qa/spec/runtime/api/client_spec.rb
index 6f7020d6595..dd139fda980 100644
--- a/qa/spec/runtime/api/client_spec.rb
+++ b/qa/spec/runtime/api/client_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::API::Client do
+RSpec.describe QA::Runtime::API::Client do
   include Helpers::StubENV
 
   describe 'initialization' do
diff --git a/qa/spec/runtime/api/request_spec.rb b/qa/spec/runtime/api/request_spec.rb
index 8354eff6234..93de2f4a87e 100644
--- a/qa/spec/runtime/api/request_spec.rb
+++ b/qa/spec/runtime/api/request_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::API::Request do
+RSpec.describe QA::Runtime::API::Request do
   let(:client)  { QA::Runtime::API::Client.new('http://example.com') }
   let(:request) { described_class.new(client, '/users') }
 
diff --git a/qa/spec/runtime/application_settings_spec.rb b/qa/spec/runtime/application_settings_spec.rb
index e48214b22e6..5c4947f6f70 100644
--- a/qa/spec/runtime/application_settings_spec.rb
+++ b/qa/spec/runtime/application_settings_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::ApplicationSettings do
+RSpec.describe QA::Runtime::ApplicationSettings do
   let(:api_client) { double('QA::Runtime::API::Client') }
   let(:request) { Struct.new(:url).new('http://api') }
   let(:get_response) { Struct.new(:body).new("{}") }
diff --git a/qa/spec/runtime/env_spec.rb b/qa/spec/runtime/env_spec.rb
index 0cfb9a70c88..3396ae6f0b8 100644
--- a/qa/spec/runtime/env_spec.rb
+++ b/qa/spec/runtime/env_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::Env do
+RSpec.describe QA::Runtime::Env do
   include Helpers::StubENV
 
   shared_examples 'boolean method' do |**kwargs|
@@ -341,7 +341,7 @@ describe QA::Runtime::Env do
     end
   end
 
-  describe '.address_matches?' do
+  describe '.context_matches?' do
     it 'returns true when url has .com' do
       QA::Runtime::Scenario.define(:gitlab_address, "https://staging.gitlab.com")
 
@@ -364,24 +364,24 @@ describe QA::Runtime::Env do
       it 'matches multiple subdomains' do
         QA::Runtime::Scenario.define(:gitlab_address, "https://staging.gitlab.com")
 
-        expect(described_class.address_matches?(subdomain: [:release, :staging])).to be_truthy
-        expect(described_class.address_matches?(:production, subdomain: [:release, :staging])).to be_truthy
+        expect(described_class.context_matches?(subdomain: [:release, :staging])).to be_truthy
+        expect(described_class.context_matches?(:production, subdomain: [:release, :staging])).to be_truthy
       end
 
       it 'matches :production' do
         QA::Runtime::Scenario.define(:gitlab_address, "https://gitlab.com/")
 
-        expect(described_class.address_matches?(:production)).to be_truthy
+        expect(described_class.context_matches?(:production)).to be_truthy
       end
 
       it 'doesnt match with mismatching switches' do
         QA::Runtime::Scenario.define(:gitlab_address, 'https://gitlab.test')
 
         aggregate_failures do
-          expect(described_class.address_matches?(tld: '.net')).to be_falsey
-          expect(described_class.address_matches?(:production)).to be_falsey
-          expect(described_class.address_matches?(subdomain: [:staging])).to be_falsey
-          expect(described_class.address_matches?(domain: 'example')).to be_falsey
+          expect(described_class.context_matches?(tld: '.net')).to be_falsey
+          expect(described_class.context_matches?(:production)).to be_falsey
+          expect(described_class.context_matches?(subdomain: [:staging])).to be_falsey
+          expect(described_class.context_matches?(domain: 'example')).to be_falsey
         end
       end
     end
@@ -389,7 +389,7 @@ describe QA::Runtime::Env do
     it 'returns false for mismatching' do
       QA::Runtime::Scenario.define(:gitlab_address, "https://staging.gitlab.com")
 
-      expect(described_class.address_matches?(:production)).to be_falsey
+      expect(described_class.context_matches?(:production)).to be_falsey
     end
   end
 end
diff --git a/qa/spec/runtime/feature_spec.rb b/qa/spec/runtime/feature_spec.rb
index db3c2f65963..39c20dd3070 100644
--- a/qa/spec/runtime/feature_spec.rb
+++ b/qa/spec/runtime/feature_spec.rb
@@ -1,87 +1,215 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::Feature do
+RSpec.describe QA::Runtime::Feature do
   let(:api_client) { double('QA::Runtime::API::Client') }
   let(:request) { Struct.new(:url).new('http://api') }
   let(:response_post) { Struct.new(:code).new(201) }
-  let(:response_get) { Struct.new(:code, :body).new(200, '[{ "name": "a-flag", "state": "on" }]') }
 
   before do
     allow(described_class).to receive(:api_client).and_return(api_client)
   end
 
-  describe '.enable' do
-    it 'enables a feature flag' do
-      expect(QA::Runtime::API::Request)
-        .to receive(:new)
-        .with(api_client, "/features/a-flag")
-        .and_return(request)
-      expect(described_class)
-        .to receive(:post)
-        .with(request.url, { value: true })
-        .and_return(response_post)
-
-      subject.enable('a-flag')
-    end
+  where(:feature_flag) do
+    ['a_flag', :a_flag]
   end
 
-  describe '.enable_and_verify' do
-    it 'enables a feature flag' do
-      allow(described_class).to receive(:get).and_return(response_get)
+  with_them do
+    shared_examples 'enables a feature flag' do
+      it 'enables a feature flag for a scope' do
+        allow(described_class).to receive(:get)
+          .and_return(Struct.new(:code, :body).new(200, '[{ "name": "a_flag", "state": "on" }]'))
 
-      expect(QA::Runtime::API::Request).to receive(:new)
-        .with(api_client, "/features/a-flag").and_return(request)
-      expect(described_class).to receive(:post)
-        .with(request.url, { value: true }).and_return(response_post)
-      expect(QA::Runtime::API::Request).to receive(:new)
-        .with(api_client, "/features").and_return(request)
+        expect(QA::Runtime::API::Request).to receive(:new)
+          .with(api_client, "/features/a_flag").and_return(request)
+        expect(described_class).to receive(:post)
+          .with(request.url, { value: true, scope => actor_name }).and_return(response_post)
+        expect(QA::Runtime::API::Request).to receive(:new)
+          .with(api_client, "/features").and_return(request)
+        expect(QA::Runtime::Logger).to receive(:info).with("Enabling feature: a_flag for scope \"#{scope}: #{actor_name}\"")
+        expect(QA::Runtime::Logger).to receive(:info).with("Successfully enabled and verified feature flag: a_flag")
 
-      subject.enable_and_verify('a-flag')
+        described_class.enable(feature_flag, scope => actor)
+      end
     end
-  end
 
-  describe '.disable' do
-    it 'disables a feature flag' do
-      expect(QA::Runtime::API::Request)
-        .to receive(:new)
-        .with(api_client, "/features/a-flag")
-        .and_return(request)
-      expect(described_class)
-        .to receive(:post)
-        .with(request.url, { value: false })
-        .and_return(response_post)
-
-      subject.disable('a-flag')
+    shared_examples 'disables a feature flag' do
+      it 'disables a feature flag for a scope' do
+        allow(described_class).to receive(:get)
+          .and_return(Struct.new(:code, :body).new(200, '[{ "name": "a_flag", "state": "off" }]'))
+
+        expect(QA::Runtime::API::Request).to receive(:new)
+          .with(api_client, "/features/a_flag").and_return(request)
+        expect(described_class).to receive(:post)
+          .with(request.url, { value: false, scope => actor_name }).and_return(response_post)
+        expect(QA::Runtime::API::Request).to receive(:new)
+          .with(api_client, "/features").and_return(request)
+        expect(QA::Runtime::Logger).to receive(:info).with("Disabling feature: a_flag for scope \"#{scope}: #{actor_name}\"")
+        expect(QA::Runtime::Logger).to receive(:info).with("Successfully disabled and verified feature flag: a_flag")
+
+        described_class.disable(feature_flag, scope => actor )
+      end
     end
-  end
 
-  describe '.disable_and_verify' do
-    it 'disables a feature flag' do
-      allow(described_class).to receive(:get)
-        .and_return(Struct.new(:code, :body).new(200, '[{ "name": "a-flag", "state": "off" }]'))
+    shared_examples 'checks a feature flag' do
+      context 'when the flag is enabled for a scope' do
+        it 'returns the feature flag state' do
+          expect(QA::Runtime::API::Request)
+            .to receive(:new)
+            .with(api_client, "/features")
+            .and_return(request)
+          expect(described_class)
+            .to receive(:get)
+            .and_return(Struct.new(:code, :body).new(200, %Q([{ "name": "a_flag", "state": "conditional", "gates": #{gates} }])))
+
+          expect(described_class.enabled?(feature_flag, scope => actor)).to be_truthy
+        end
+      end
+    end
 
-      expect(QA::Runtime::API::Request).to receive(:new)
-        .with(api_client, "/features/a-flag").and_return(request)
-      expect(described_class).to receive(:post)
-        .with(request.url, { value: false }).and_return(response_post)
-      expect(QA::Runtime::API::Request).to receive(:new)
-        .with(api_client, "/features").and_return(request)
+    describe '.enable' do
+      it 'enables a feature flag' do
+        allow(described_class).to receive(:get)
+          .and_return(Struct.new(:code, :body).new(200, '[{ "name": "a_flag", "state": "on" }]'))
 
-      subject.disable_and_verify('a-flag')
+        expect(QA::Runtime::API::Request).to receive(:new)
+          .with(api_client, "/features/a_flag").and_return(request)
+        expect(described_class).to receive(:post)
+          .with(request.url, { value: true }).and_return(response_post)
+        expect(QA::Runtime::API::Request).to receive(:new)
+          .with(api_client, "/features").and_return(request)
+
+        described_class.enable(feature_flag)
+      end
+
+      context 'when a project scope is provided' do
+        it_behaves_like 'enables a feature flag' do
+          let(:scope) { :project }
+          let(:actor_name) { 'group-name/project-name' }
+          let(:actor) { Struct.new(:full_path).new(actor_name) }
+        end
+      end
+
+      context 'when a group scope is provided' do
+        it_behaves_like 'enables a feature flag' do
+          let(:scope) { :group }
+          let(:actor_name) { 'group-name' }
+          let(:actor) { Struct.new(:full_path).new(actor_name) }
+        end
+      end
+
+      context 'when a user scope is provided' do
+        it_behaves_like 'enables a feature flag' do
+          let(:scope) { :user }
+          let(:actor_name) { 'user-name' }
+          let(:actor) { Struct.new(:username).new(actor_name) }
+        end
+      end
+
+      context 'when a feature group scope is provided' do
+        it_behaves_like 'enables a feature flag' do
+          let(:scope) { :feature_group }
+          let(:actor_name) { 'foo' }
+          let(:actor) { "foo" }
+        end
+      end
     end
-  end
 
-  describe '.enabled?' do
-    it 'returns a feature flag state' do
-      expect(QA::Runtime::API::Request)
-        .to receive(:new)
-        .with(api_client, "/features")
-        .and_return(request)
-      expect(described_class)
-        .to receive(:get)
-        .and_return(response_get)
-
-      expect(subject.enabled?('a-flag')).to be_truthy
+    describe '.disable' do
+      it 'disables a feature flag' do
+        allow(described_class).to receive(:get)
+          .and_return(Struct.new(:code, :body).new(200, '[{ "name": "a_flag", "state": "off" }]'))
+
+        expect(QA::Runtime::API::Request).to receive(:new)
+          .with(api_client, "/features/a_flag").and_return(request)
+        expect(described_class).to receive(:post)
+          .with(request.url, { value: false }).and_return(response_post)
+        expect(QA::Runtime::API::Request).to receive(:new)
+          .with(api_client, "/features").and_return(request)
+
+        described_class.disable(feature_flag)
+      end
+
+      context 'when a project scope is provided' do
+        it_behaves_like 'disables a feature flag' do
+          let(:scope) { :project }
+          let(:actor_name) { 'group-name/project-name' }
+          let(:actor) { Struct.new(:full_path).new(actor_name) }
+        end
+      end
+
+      context 'when a group scope is provided' do
+        it_behaves_like 'disables a feature flag' do
+          let(:scope) { :group }
+          let(:actor_name) { 'group-name' }
+          let(:actor) { Struct.new(:full_path).new(actor_name) }
+        end
+      end
+
+      context 'when a user scope is provided' do
+        it_behaves_like 'disables a feature flag' do
+          let(:scope) { :user }
+          let(:actor_name) { 'user-name' }
+          let(:actor) { Struct.new(:username).new(actor_name) }
+        end
+      end
+
+      context 'when a feature group scope is provided' do
+        it_behaves_like 'disables a feature flag' do
+          let(:scope) { :feature_group }
+          let(:actor_name) { 'foo' }
+          let(:actor) { "foo" }
+        end
+      end
+    end
+
+    describe '.enabled?' do
+      it 'returns a feature flag state' do
+        expect(QA::Runtime::API::Request)
+          .to receive(:new)
+          .with(api_client, "/features")
+          .and_return(request)
+        expect(described_class)
+          .to receive(:get)
+          .and_return(Struct.new(:code, :body).new(200, '[{ "name": "a_flag", "state": "on" }]'))
+
+        expect(described_class.enabled?(feature_flag)).to be_truthy
+      end
+
+      context 'when a project scope is provided' do
+        it_behaves_like 'checks a feature flag' do
+          let(:scope) { :project }
+          let(:actor_name) { 'group-name/project-name' }
+          let(:actor) { Struct.new(:full_path, :id).new(actor_name, 270) }
+          let(:gates) { %q([{"key": "actors", "value": ["Project:270"]}]) }
+        end
+      end
+
+      context 'when a group scope is provided' do
+        it_behaves_like 'checks a feature flag' do
+          let(:scope) { :group }
+          let(:actor_name) { 'group-name' }
+          let(:actor) { Struct.new(:full_path, :id).new(actor_name, 33) }
+          let(:gates) { %q([{"key": "actors", "value": ["Group:33"]}]) }
+        end
+      end
+
+      context 'when a user scope is provided' do
+        it_behaves_like 'checks a feature flag' do
+          let(:scope) { :user }
+          let(:actor_name) { 'user-name' }
+          let(:actor) { Struct.new(:full_path, :id).new(actor_name, 13) }
+          let(:gates) { %q([{"key": "actors", "value": ["User:13"]}]) }
+        end
+      end
+
+      context 'when a feature group scope is provided' do
+        it_behaves_like 'checks a feature flag' do
+          let(:scope) { :feature_group }
+          let(:actor_name) { 'foo' }
+          let(:actor) { "foo" }
+          let(:gates) { %q([{"key": "groups", "value": ["foo"]}]) }
+        end
+      end
     end
   end
 end
diff --git a/qa/spec/runtime/key/ecdsa_spec.rb b/qa/spec/runtime/key/ecdsa_spec.rb
index 3f9718e62c5..499233df618 100644
--- a/qa/spec/runtime/key/ecdsa_spec.rb
+++ b/qa/spec/runtime/key/ecdsa_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::Key::ECDSA do
+RSpec.describe QA::Runtime::Key::ECDSA do
   describe '#public_key' do
     [256, 384, 521].each do |bits|
       it "generates a public #{bits}-bits ECDSA key" do
diff --git a/qa/spec/runtime/key/ed25519_spec.rb b/qa/spec/runtime/key/ed25519_spec.rb
index 08f232260af..e63c7f5deae 100644
--- a/qa/spec/runtime/key/ed25519_spec.rb
+++ b/qa/spec/runtime/key/ed25519_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::Key::ED25519 do
+RSpec.describe QA::Runtime::Key::ED25519 do
   describe '#public_key' do
     subject { described_class.new.public_key }
 
diff --git a/qa/spec/runtime/key/rsa_spec.rb b/qa/spec/runtime/key/rsa_spec.rb
index fcb52f541bf..5b5d8a13fa1 100644
--- a/qa/spec/runtime/key/rsa_spec.rb
+++ b/qa/spec/runtime/key/rsa_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::Key::RSA do
+RSpec.describe QA::Runtime::Key::RSA do
   describe '#public_key' do
     subject { described_class.new.public_key }
 
diff --git a/qa/spec/runtime/logger_spec.rb b/qa/spec/runtime/logger_spec.rb
index 44be3381bff..a888bf1452b 100644
--- a/qa/spec/runtime/logger_spec.rb
+++ b/qa/spec/runtime/logger_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::Logger do
+RSpec.describe QA::Runtime::Logger do
   before do
     logger = Logger.new $stdout
     logger.level = ::Logger::DEBUG
diff --git a/qa/spec/runtime/namespace_spec.rb b/qa/spec/runtime/namespace_spec.rb
index d24fa509f30..92836862864 100644
--- a/qa/spec/runtime/namespace_spec.rb
+++ b/qa/spec/runtime/namespace_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::Namespace do
+RSpec.describe QA::Runtime::Namespace do
   include Helpers::StubENV
 
   describe '.name' do
diff --git a/qa/spec/runtime/release_spec.rb b/qa/spec/runtime/release_spec.rb
index b5a7dd5269d..b4e278fb546 100644
--- a/qa/spec/runtime/release_spec.rb
+++ b/qa/spec/runtime/release_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::Release do
+RSpec.describe QA::Runtime::Release do
   context 'when release version has extension strategy' do
     let(:strategy) { spy('strategy') }
 
diff --git a/qa/spec/runtime/scenario_spec.rb b/qa/spec/runtime/scenario_spec.rb
index 30ada4529ed..175973b6795 100644
--- a/qa/spec/runtime/scenario_spec.rb
+++ b/qa/spec/runtime/scenario_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe QA::Runtime::Scenario do
+RSpec.describe QA::Runtime::Scenario do
   subject do
     Module.new.extend(described_class)
   end