Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 1 deletions

diff --git a/spec/models/project_statistics_spec.rb b/spec/models/project_statistics_spec.rb
index f3f1e43f6c5..1a3283dfe51 100644
--- a/spec/models/project_statistics_spec.rb
+++ b/spec/models/project_statistics_spec.rb
@@ -430,7 +430,25 @@ RSpec.describe ProjectStatistics do
         storage_size: 0
       )
 
-      expect { subject }.to change { statistics.storage_size }.from(0).to(28)
+      expect { subject }.to change { statistics.reload.storage_size }.from(0).to(28)
+    end
+
+    context 'when nullable columns are nil' do
+      before do
+        statistics.update_columns(
+          repository_size: 2,
+          wiki_size: nil,
+          storage_size: 0
+        )
+      end
+
+      it 'does not raise any error' do
+        expect { subject }.not_to raise_error
+      end
+
+      it 'recalculates storage size from its components' do
+        expect { subject }.to change { statistics.reload.storage_size }.from(0).to(2)
+      end
     end
 
     it_behaves_like 'obtaining lease to update database' do