Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953

2 files changed, 74 insertions, 0 deletions

diff --git a/spec/services/deploy_tokens/create_service_spec.rb b/spec/services/deploy_tokens/create_service_spec.rb
index 886ffd4593d..fbb66fe4cb7 100644
--- a/spec/services/deploy_tokens/create_service_spec.rb
+++ b/spec/services/deploy_tokens/create_service_spec.rb
@@ -32,6 +32,22 @@ describe DeployTokens::CreateService do
       end
     end
 
+    context 'when username is empty string' do
+      let(:deploy_token_params) { attributes_for(:deploy_token, username: '') }
+
+      it 'converts it to nil' do
+        expect(subject.read_attribute(:username)).to be_nil
+      end
+    end
+
+    context 'when username is provided' do
+      let(:deploy_token_params) { attributes_for(:deploy_token, username: 'deployer') }
+
+      it 'keeps the provided username' do
+        expect(subject.read_attribute(:username)).to eq('deployer')
+      end
+    end
+
     context 'when the deploy token is invalid' do
       let(:deploy_token_params) { attributes_for(:deploy_token, read_repository: false, read_registry: false) }
 
diff --git a/spec/services/namespaces/statistics_refresher_service_spec.rb b/spec/services/namespaces/statistics_refresher_service_spec.rb
new file mode 100644
index 00000000000..f4d9c96f7f4
--- /dev/null
+++ b/spec/services/namespaces/statistics_refresher_service_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Namespaces::StatisticsRefresherService, '#execute' do
+  let(:group) { create(:group) }
+  let(:projects) { create_list(:project, 5, namespace: group) }
+  let(:service) { described_class.new }
+
+  context 'without a root storage statistics relation' do
+    it 'creates one' do
+      expect do
+        service.execute(group)
+      end.to change(Namespace::RootStorageStatistics, :count).by(1)
+
+      expect(group.reload.root_storage_statistics).to be_present
+    end
+
+    it 'recalculate the namespace statistics' do
+      expect_any_instance_of(Namespace::RootStorageStatistics).to receive(:recalculate!).once
+
+      service.execute(group)
+    end
+  end
+
+  context 'with a root storage statistics relation' do
+    before do
+      Namespace::AggregationSchedule.safe_find_or_create_by!(namespace_id: group.id)
+    end
+
+    it 'does not create one' do
+      expect do
+        service.execute(group)
+      end.not_to change(Namespace::RootStorageStatistics, :count)
+    end
+
+    it 'recalculate the namespace statistics' do
+      expect(Namespace::RootStorageStatistics)
+        .to receive(:safe_find_or_create_by!).with({ namespace_id: group.id })
+        .and_return(group.root_storage_statistics)
+
+      service.execute(group)
+    end
+  end
+
+  context 'when something goes wrong' do
+    before do
+      allow_any_instance_of(Namespace::RootStorageStatistics)
+        .to receive(:recalculate!).and_raise(ActiveRecord::ActiveRecordError)
+    end
+
+    it 'raises RefreshError' do
+      expect do
+        service.execute(group)
+      end.to raise_error(Namespaces::StatisticsRefresherService::RefresherError)
+    end
+  end
+end