Commit 68d6a2a2 authored by Valery Sizov's avatar Valery Sizov

Fix Project#repository_and_lfs_size after removing repository_size method

parent 832ea8a8
...@@ -1507,7 +1507,7 @@ class Project < ActiveRecord::Base ...@@ -1507,7 +1507,7 @@ class Project < ActiveRecord::Base
end end
def repository_and_lfs_size def repository_and_lfs_size
repository_size + lfs_objects.sum(:size).to_i.to_mb statistics.storage_size + statistics.lfs_objects_size
end end
def above_size_limit? def above_size_limit?
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::RepositorySizeError, lib: true do describe Gitlab::RepositorySizeError, lib: true do
let(:project) { create(:empty_project, repository_size: 15) } let(:project) do
create(:empty_project, statistics: build(:project_statistics, repository_size: 15))
end
let(:message) { Gitlab::RepositorySizeError.new(project) } let(:message) { Gitlab::RepositorySizeError.new(project) }
let(:base_message) { 'because this repository has exceeded its size limit of 10 MB by 5 MB' } let(:base_message) { 'because this repository has exceeded its size limit of 10 MB by 5 MB' }
......
...@@ -588,6 +588,11 @@ describe Project, models: true do ...@@ -588,6 +588,11 @@ describe Project, models: true do
end end
describe '#above_size_limit?' do describe '#above_size_limit?' do
let(:project) do
create(:empty_project,
statistics: build(:project_statistics))
end
it 'returns true when above the limit' do it 'returns true when above the limit' do
allow(project).to receive(:repository_and_lfs_size).and_return(100) allow(project).to receive(:repository_and_lfs_size).and_return(100)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment