Add latest changes from gitlab-org/gitlab@master

3 files changed, 69 insertions, 30 deletions

diff --git a/spec/features/groups/settings/ci_cd_spec.rb b/spec/features/groups/settings/ci_cd_spec.rb
index 8851aeb6381..c5ad524e647 100644
--- a/spec/features/groups/settings/ci_cd_spec.rb
+++ b/spec/features/groups/settings/ci_cd_spec.rb
@@ -5,52 +5,73 @@ require 'spec_helper'
 RSpec.describe 'Group CI/CD settings' do
   include WaitForRequests
 
-  let(:user) { create(:user) }
-  let(:group) { create(:group) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group, reload: true) { create(:group) }
 
-  before do
+  before_all do
     group.add_owner(user)
+  end
+
+  before do
     sign_in(user)
   end
 
-  describe 'new group runners view banner' do
-    it 'displays banner' do
-      visit group_settings_ci_cd_path(group)
+  describe 'Runners section' do
+    let(:shared_runners_toggle) { page.find('[data-testid="enable-runners-toggle"]') }
+
+    context 'with runner_list_group_view_vue_ui enabled' do
+      before do
+        visit group_settings_ci_cd_path(group)
+      end
+
+      it 'displays the new group runners view banner' do
+        expect(page).to have_content(s_('Runners|New group runners view'))
+        expect(page).to have_link(href: group_runners_path(group))
+      end
 
-      expect(page).to have_content(s_('Runners|New group runners view'))
-      expect(page).to have_link(href: group_runners_path(group))
+      it 'has "Enable shared runners for this group" toggle', :js do
+        expect(shared_runners_toggle).to have_content(_('Enable shared runners for this group'))
+      end
     end
 
-    it 'does not display banner' do
-      stub_feature_flags(runner_list_group_view_vue_ui: false)
+    context 'with runner_list_group_view_vue_ui disabled' do
+      before do
+        stub_feature_flags(runner_list_group_view_vue_ui: false)
 
-      visit group_settings_ci_cd_path(group)
+        visit group_settings_ci_cd_path(group)
+      end
 
-      expect(page).not_to have_content(s_('Runners|New group runners view'))
-      expect(page).not_to have_link(href: group_runners_path(group))
-    end
-  end
+      it 'does not display the new group runners view banner' do
+        expect(page).not_to have_content(s_('Runners|New group runners view'))
+        expect(page).not_to have_link(href: group_runners_path(group))
+      end
 
-  describe 'runners registration token' do
-    let!(:token) { group.runners_token }
+      it 'has "Enable shared runners for this group" toggle', :js do
+        expect(shared_runners_toggle).to have_content(_('Enable shared runners for this group'))
+      end
 
-    before do
-      visit group_settings_ci_cd_path(group)
-    end
+      context 'with runners registration token' do
+        let!(:token) { group.runners_token }
 
-    it 'has a registration token' do
-      expect(page.find('#registration_token')).to have_content(token)
-    end
+        before do
+          visit group_settings_ci_cd_path(group)
+        end
 
-    describe 'reload registration token' do
-      let(:page_token) { find('#registration_token').text }
+        it 'displays the registration token' do
+          expect(page.find('#registration_token')).to have_content(token)
+        end
 
-      before do
-        click_button 'Reset registration token'
-      end
+        describe 'reload registration token' do
+          let(:page_token) { find('#registration_token').text }
+
+          before do
+            click_button 'Reset registration token'
+          end
 
-      it 'changes registration token' do
-        expect(page_token).not_to eq token
+          it 'changes the registration token' do
+            expect(page_token).not_to eq token
+          end
+        end
       end
     end
   end
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 49c468976b9..2dddcd62a6c 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -352,6 +352,7 @@ RSpec.describe 'Runners' do
 
     before do
       group.add_owner(user)
+      stub_feature_flags(runner_list_group_view_vue_ui: false)
     end
 
     context 'group with no runners' do
diff --git a/spec/lib/backup/manager_spec.rb b/spec/lib/backup/manager_spec.rb
index 24b18ef95a4..192739d05a7 100644
--- a/spec/lib/backup/manager_spec.rb
+++ b/spec/lib/backup/manager_spec.rb
@@ -440,6 +440,23 @@ RSpec.describe Backup::Manager do
         connection.directories.create(key: Gitlab.config.backup.upload.remote_directory) # rubocop:disable Rails/SaveBang
       end
 
+      context 'skipped upload' do
+        let(:backup_information) do
+          {
+            backup_created_at: Time.zone.parse('2019-01-01'),
+            gitlab_version: '12.3',
+            skipped: ['remote']
+          }
+        end
+
+        it 'informs the user' do
+          stub_env('SKIP', 'remote')
+          subject.create # rubocop:disable Rails/SaveBang
+
+          expect(Gitlab::BackupLogger).to have_received(:info).with(message: 'Uploading backup archive to remote storage directory ... [SKIPPED]')
+        end
+      end
+
       context 'target path' do
         it 'uses the tar filename by default' do
           expect_any_instance_of(Fog::Collection).to receive(:create)