Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

3 files changed, 117 insertions, 0 deletions

diff --git a/spec/lib/api/entities/merge_request_basic_spec.rb b/spec/lib/api/entities/merge_request_basic_spec.rb
index 715fcf4bcdb..fe4c27b70ae 100644
--- a/spec/lib/api/entities/merge_request_basic_spec.rb
+++ b/spec/lib/api/entities/merge_request_basic_spec.rb
@@ -40,4 +40,31 @@ RSpec.describe ::API::Entities::MergeRequestBasic do
       expect(batch.count).to be_within(3 * query.count).of(control.count)
     end
   end
+
+  context 'reviewers' do
+    context "when merge_request_reviewers FF is enabled" do
+      before do
+        stub_feature_flags(merge_request_reviewers: true)
+        merge_request.reviewers = [user]
+      end
+
+      it 'includes assigned reviewers' do
+        result = Gitlab::Json.parse(present(merge_request).to_json)
+
+        expect(result['reviewers'][0]['username']).to eq user.username
+      end
+    end
+
+    context "when merge_request_reviewers FF is disabled" do
+      before do
+        stub_feature_flags(merge_request_reviewers: false)
+      end
+
+      it 'does not include reviewers' do
+        result = Gitlab::Json.parse(present(merge_request).to_json)
+
+        expect(result.keys).not_to include('reviewers')
+      end
+    end
+  end
 end
diff --git a/spec/lib/api/helpers/sse_helpers_spec.rb b/spec/lib/api/helpers/sse_helpers_spec.rb
new file mode 100644
index 00000000000..397051d9142
--- /dev/null
+++ b/spec/lib/api/helpers/sse_helpers_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe API::Helpers::SSEHelpers do
+  include Gitlab::Routing
+
+  let_it_be(:project) { create(:project) }
+
+  subject { Class.new.include(described_class).new }
+
+  describe '#request_from_sse?' do
+    before do
+      allow(subject).to receive(:request).and_return(request)
+    end
+
+    context 'when referer is nil' do
+      let(:request) { double(referer: nil)}
+
+      it 'returns false' do
+        expect(URI).not_to receive(:parse)
+        expect(subject.request_from_sse?(project)).to eq false
+      end
+    end
+
+    context 'when referer is not from SSE' do
+      let(:request) { double(referer: 'https://gitlab.com')}
+
+      it 'returns false' do
+        expect(URI).to receive(:parse).and_call_original
+        expect(subject.request_from_sse?(project)).to eq false
+      end
+    end
+
+    context 'when referer is from SSE' do
+      let(:request) { double(referer: project_show_sse_path(project, 'master/README.md'))}
+
+      it 'returns true' do
+        expect(URI).to receive(:parse).and_call_original
+        expect(subject.request_from_sse?(project)).to eq true
+      end
+    end
+  end
+end
diff --git a/spec/lib/api/validations/validators/integer_or_custom_value_spec.rb b/spec/lib/api/validations/validators/integer_or_custom_value_spec.rb
new file mode 100644
index 00000000000..a04917736db
--- /dev/null
+++ b/spec/lib/api/validations/validators/integer_or_custom_value_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe API::Validations::Validators::IntegerOrCustomValue do
+  include ApiValidatorsHelpers
+
+  let(:custom_values) { %w[None Any Started Current] }
+
+  subject { described_class.new(['test'], { values: custom_values }, false, scope.new) }
+
+  context 'valid parameters' do
+    it 'does not raise a validation error' do
+      expect_no_validation_error('test' => 2)
+      expect_no_validation_error('test' => 100)
+      expect_no_validation_error('test' => 'None')
+      expect_no_validation_error('test' => 'Any')
+      expect_no_validation_error('test' => 'none')
+      expect_no_validation_error('test' => 'any')
+      expect_no_validation_error('test' => 'started')
+      expect_no_validation_error('test' => 'CURRENT')
+    end
+
+    context 'when custom values is empty and value is an integer' do
+      let(:custom_values) { [] }
+
+      it 'does not raise a validation error' do
+        expect_no_validation_error({ 'test' => 5 })
+      end
+    end
+  end
+
+  context 'invalid parameters' do
+    it 'raises a validation error' do
+      expect_validation_error({ 'test' => 'Upcomming' })
+    end
+
+    context 'when custom values is empty and value is not an integer' do
+      let(:custom_values) { [] }
+
+      it 'raises a validation error' do
+        expect_validation_error({ 'test' => '5' })
+      end
+    end
+  end
+end