Add latest changes from gitlab-org/gitlab@master

3 files changed, 30 insertions, 4 deletions

diff --git a/spec/frontend/registry/components/table_registry_spec.js b/spec/frontend/registry/components/table_registry_spec.js
index c827cc6ea48..021f13feeba 100644
--- a/spec/frontend/registry/components/table_registry_spec.js
+++ b/spec/frontend/registry/components/table_registry_spec.js
@@ -196,7 +196,7 @@ describe('table registry', () => {
     it('should show the singular title and image name when deleting a single image', () => {
       wrapper.setData({ itemsToBeDeleted: [1] });
       wrapper.vm.setModalDescription(0);
-      expect(wrapper.vm.modalTitle).toBe('Remove tag');
+      expect(wrapper.vm.modalAction).toBe('Remove tag');
       expect(wrapper.vm.modalDescription).toContain(firstImage.tag);
     });
 
@@ -204,7 +204,7 @@ describe('table registry', () => {
       wrapper.setData({ itemsToBeDeleted: [1, 2] });
       wrapper.vm.setModalDescription();
 
-      expect(wrapper.vm.modalTitle).toBe('Remove tags');
+      expect(wrapper.vm.modalAction).toBe('Remove tags');
       expect(wrapper.vm.modalDescription).toContain('<b>2</b> tags');
     });
   });
diff --git a/spec/models/clusters/applications/jupyter_spec.rb b/spec/models/clusters/applications/jupyter_spec.rb
index e1eee014567..0ec9333d6a7 100644
--- a/spec/models/clusters/applications/jupyter_spec.rb
+++ b/spec/models/clusters/applications/jupyter_spec.rb
@@ -91,7 +91,6 @@ describe Clusters::Applications::Jupyter do
       it 'includes valid values' do
         expect(values).to include('ingress')
         expect(values).to include('hub')
-        expect(values).to include('rbac')
         expect(values).to include('proxy')
         expect(values).to include('auth')
         expect(values).to include('singleuser')
@@ -111,7 +110,6 @@ describe Clusters::Applications::Jupyter do
       it 'includes valid values' do
         expect(values).to include('ingress')
         expect(values).to include('hub')
-        expect(values).to include('rbac')
         expect(values).to include('proxy')
         expect(values).to include('auth')
         expect(values).to include('singleuser')
diff --git a/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb b/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb
new file mode 100644
index 00000000000..3029bfb6df5
--- /dev/null
+++ b/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'admin/application_settings/_repository_storage.html.haml' do
+  let(:app_settings) { build(:application_setting) }
+  let(:storages) do
+    {
+      "mepmep" => { "path" => "/tmp" },
+      "foobar" => { "path" => "/tmp" }
+    }
+  end
+
+  before do
+    assign(:application_setting, app_settings)
+    stub_storage_settings(storages)
+  end
+
+  context 'when multiple storages are available' do
+    it 'lists them all' do
+      render
+
+      storages.keys.each do |storage_name|
+        expect(rendered).to have_content(storage_name)
+      end
+    end
+  end
+end